diff options
Diffstat (limited to 'metadata/md5-cache/app-misc')
| -rw-r--r-- | metadata/md5-cache/app-misc/Manifest.gz | bin | 78370 -> 78828 bytes | |||
| -rw-r--r-- | metadata/md5-cache/app-misc/devtodo-0.1.20-r3 | 4 | ||||
| -rw-r--r-- | metadata/md5-cache/app-misc/mc-4.8.23-r1 | 4 | ||||
| -rw-r--r-- | metadata/md5-cache/app-misc/tmux-2.9a | 9 | ||||
| -rw-r--r-- | metadata/md5-cache/app-misc/vcontrold-0.98.8 | 4 |
5 files changed, 21 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz Binary files differindex 6652235e0feb..956744c5f597 100644 --- a/metadata/md5-cache/app-misc/Manifest.gz +++ b/metadata/md5-cache/app-misc/Manifest.gz diff --git a/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 b/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 index b5eb47260759..87347ef93fc2 100644 --- a/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 +++ b/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 @@ -8,5 +8,9 @@ LICENSE=GPL-2 RDEPEND=>=sys-libs/ncurses-5.2:0= >=sys-libs/readline-4.1:0= SLOT=0 SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +>>>>>>> next _md5_=b55362261a3b60b40288bf790718698f diff --git a/metadata/md5-cache/app-misc/mc-4.8.23-r1 b/metadata/md5-cache/app-misc/mc-4.8.23-r1 index 510235bf659a..df9906654e53 100644 --- a/metadata/md5-cache/app-misc/mc-4.8.23-r1 +++ b/metadata/md5-cache/app-misc/mc-4.8.23-r1 @@ -10,5 +10,9 @@ RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2 REQUIRED_USE=spell? ( edit ) SLOT=0 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.23.tar.xz +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=d02532d62fe2899b716adfa8f2269268 diff --git a/metadata/md5-cache/app-misc/tmux-2.9a b/metadata/md5-cache/app-misc/tmux-2.9a index 327b17262721..8a055c662614 100644 --- a/metadata/md5-cache/app-misc/tmux-2.9a +++ b/metadata/md5-cache/app-misc/tmux-2.9a @@ -5,10 +5,19 @@ DESCRIPTION=Terminal multiplexer EAPI=7 HOMEPAGE=https://tmux.github.io/ IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux +<<<<<<< HEAD +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +======= KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +>>>>>>> next LICENSE=ISC RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux ) SLOT=0 SRC_URI=https://github.com/tmux/tmux/releases/download/2.9a/tmux-2.9a.tar.gz +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +_md5_=5396dfb591881895c775bc306cc3f1f4 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a _md5_=2bfe173a65dca4642235d7a9ff30e937 +>>>>>>> next diff --git a/metadata/md5-cache/app-misc/vcontrold-0.98.8 b/metadata/md5-cache/app-misc/vcontrold-0.98.8 index 7e72461a9d29..b24e1b0393d2 100644 --- a/metadata/md5-cache/app-misc/vcontrold-0.98.8 +++ b/metadata/md5-cache/app-misc/vcontrold-0.98.8 @@ -10,5 +10,9 @@ LICENSE=GPL-3+ RDEPEND=dev-libs/libxml2:2 SLOT=0 SRC_URI=https://github.com/openv/vcontrold/archive/v0.98.8.tar.gz -> vcontrold-0.98.8.tar.gz +<<<<<<< HEAD +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3b84bf816ae2172735f5d155c228db13 |