diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /app-misc/tmux | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'app-misc/tmux')
| -rw-r--r-- | app-misc/tmux/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/tmux/tmux-2.9a.ebuild | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest index 1973909a5116..a5a240ef47d1 100644 --- a/app-misc/tmux/Manifest +++ b/app-misc/tmux/Manifest @@ -8,6 +8,10 @@ EBUILD tmux-2.7-r1.ebuild 2117 BLAKE2B 8d4bb5506da4aafd44fdcee8c8397e247cdb1c966 EBUILD tmux-2.7.ebuild 2138 BLAKE2B 89c87ee11e1a73fd76f271eabc6fcda3809ee460b882b1bd86964ea6d4fd2753675c04ce0d81703338ff16da679add1df1e8abb3a7473e62d8897fbd245b79dd SHA512 d4dbe7723d81806f78d1d6e02edb851ce978189ad48242f7f765d19a13635bb0428d477ceb827af845b1d1fc18bbd7b446ece50d3853534f32d6526207dfe7cd EBUILD tmux-2.8-r2.ebuild 1999 BLAKE2B 2ee9211029103f19ad942252c136e5cc50cdeb7b2d0a8b2a6ad5cecc1978be286a2264fa6ebbf979a900030c4cfac17c8afb9328518ff27343892469da9bb0ba SHA512 74ef935157bc5f61ef305c2ae0913f5e9215b9326cc7433e42c1f01ceb594d95e3d730e3cf6291e7207d63ece7cb48a05184d1af8e66487502eb2a316f6ab367 EBUILD tmux-2.9.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b +<<<<<<< HEAD EBUILD tmux-2.9a.ebuild 2333 BLAKE2B fda293b0602c650578d92e5065270abbffaab9d000102535cf6cb87d037c8e3e0413be21ca9549caf44f2ec99bfb4e0452ff486c14c40625cd3c3ee454b1c4fa SHA512 7dc539a60549466a9610ae9a4d7bbea39c15e2ec2f357c906fb67becfeb83f19c88088afd01463b08f87ac26e8f9d485d69f4474ab98c262c688c398883bcd6e +======= +EBUILD tmux-2.9a.ebuild 2329 BLAKE2B 1ac85f5bead7092439982379dd11b67a238eed8b190ec0ebd8ad5a857a70d2e845102a8aa0ecad551557c0704eb3343ab494ea655ee2e9faf73184c8da0cf2ff SHA512 510677dd9dfdc8a12e642a52d13f88175067cadabdacda81eff66c7d126392cca84d579afdffd90c2ab99f6b50fc51fe39144cde34f00850db1f0f2695c2fbb1 +>>>>>>> next EBUILD tmux-9999.ebuild 2338 BLAKE2B b69396cad7f3e80f248ebcf1e25e96ae5d6f785aab57a8c8c3879ce3646cad3b4a1038631a9c94e5cff1379b7832832f45e4bd18e3d2fe87263c0323a90ddb9a SHA512 739f8a9ef385410fffd0fa9ec3fbb9c6277a37890e3f3cc2e3fa5e314b03d0303673d8778aa34546c08e12ea271b6fe83b763b3d8aa2835b860049c0df561698 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild index 561221b38ce0..4fa0176a67ac 100644 --- a/app-misc/tmux/tmux-2.9a.ebuild +++ b/app-misc/tmux/tmux-2.9a.ebuild @@ -14,7 +14,11 @@ if [[ "${PV}" == 9999 ]] ; then else SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz" [[ "${PV}" == *_rc* ]] || \ +<<<<<<< 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 S="${WORKDIR}/${P/_/-}" fi |