summaryrefslogtreecommitdiff
path: root/app-vim/merginal
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
commit0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-vim/merginal
parent752d6256e5204b958b0ef7905675a940b5e9172f (diff)
gentoo resync : 29.12.2022
Diffstat (limited to 'app-vim/merginal')
-rw-r--r--app-vim/merginal/Manifest4
-rw-r--r--app-vim/merginal/merginal-2.1.0.ebuild26
-rw-r--r--app-vim/merginal/merginal-2.1.2.ebuild4
3 files changed, 3 insertions, 31 deletions
diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index c812845713b6..cf189d223cbc 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,6 +1,4 @@
-DIST merginal-2.1.0.tar.gz 13510 BLAKE2B c44f3873f36ee540e69f1cd87558e2601f944f430d15ae0e863adbba5383637ddbae2bee01cf1f7788f677a159da7870a83b909562813f8817d610e85f9d4a96 SHA512 3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed
DIST merginal-2.1.2.tar.gz 15156 BLAKE2B a8181ebd7aa67663b4541b5cb5028b6cadcca68c48f325dca07308ad13554d1d4b96b53f0a30e516cea732c880e68cb7e4cb7836b72cbd6b59a009e8d3c744b2 SHA512 70da5529ee22b3f06d83ecac62634d46d30472f064613a1844a7cdae31ed97366b5fcf6b31f4becd4cde246ccac32be6528c8c93ee2f02bdd32932388282f9bf
-EBUILD merginal-2.1.0.ebuild 672 BLAKE2B 304c0bfd52013204e571b4be71edfaeb079247d570b13aba77356a9f2795ed855cae62b72a34f9fe139cd68c15fdfc0fcbcba1f650a2089c3b7d1f5c5b0224c9 SHA512 97310cf70c88715c0b319ac52011edfeb762c10eebacda23824352ef48683e15111528fcb5bc64e965244c2fb855b4e5ffec9b0f3fbe4d706e8f951002911044
-EBUILD merginal-2.1.2.ebuild 707 BLAKE2B d303e469f8ec5b9987ff8e023744915ea9238e8749a06fd47420673e384f5cd03247448d10128bda13a3de17cadc786269ede5fb6025b22b0cb3ca5d7e6853d6 SHA512 c8680fc6343a04c429748382a98687afe9254d5f62fa0ed3cedcf6e9cc089f317fc4da766173ca35f3af3a989b3e83cdaa72ef673f7f0afe03082d458baf91b6
+EBUILD merginal-2.1.2.ebuild 705 BLAKE2B 48081c4ac6cd58dbc3245575826dae3a4dc317491ad911a97272a5b2e9a5b918d443b2222f9540e8d04862c75e1dc96048b2c88a3eb2c1862bfc7950485424d4 SHA512 2be44882957a7fd76b008a6cc356e68c333d0b94a46ab36f4aab1ffbc7f31811f83bda854f4361a8a546a4f53ce06d702f66fc044fee4e43b5d1094b94564275
EBUILD merginal-9999.ebuild 707 BLAKE2B d303e469f8ec5b9987ff8e023744915ea9238e8749a06fd47420673e384f5cd03247448d10128bda13a3de17cadc786269ede5fb6025b22b0cb3ca5d7e6853d6 SHA512 c8680fc6343a04c429748382a98687afe9254d5f62fa0ed3cedcf6e9cc089f317fc4da766173ca35f3af3a989b3e83cdaa72ef673f7f0afe03082d458baf91b6
MISC metadata.xml 346 BLAKE2B df249d1df0a03fda0fb37be12fdcfe7ff18c3e0dea52eb51497d77d019799097168552defa4ab04385a06dbcb04bb24d75725951be8ae409f824466c7241814c SHA512 ae774d7e2d398e0e6834f0d2baa5eefe3bc5e32421c4b9cdf52c468678b79b5167713c3f1f289e591016345185826c579868ec75b395f735e5218a314d9e1b93
diff --git a/app-vim/merginal/merginal-2.1.0.ebuild b/app-vim/merginal/merginal-2.1.0.ebuild
deleted file mode 100644
index 4632645f0291..000000000000
--- a/app-vim/merginal/merginal-2.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-MY_PN=vim-${PN}
-MY_P=${MY_PN}-${PV}
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/idanarye/${MY_PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
-LICENSE="vim"
-
-RDEPEND="app-vim/fugitive"
-
-VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/merginal/merginal-2.1.2.ebuild b/app-vim/merginal/merginal-2.1.2.ebuild
index ddf93439f4e2..0687eb030dca 100644
--- a/app-vim/merginal/merginal-2.1.2.ebuild
+++ b/app-vim/merginal/merginal-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${MY_P}"
fi