[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2022-06-10 Thread Matt Turner
commit: 405ee578f1b685a7d34464a9221efd76147fc2bf
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 10 17:44:00 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 10 18:07:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=405ee578

app-vim/merginal: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 app-vim/merginal/Manifest  |  1 -
 app-vim/merginal/merginal-2.1.0.ebuild | 26 --
 2 files changed, 27 deletions(-)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index f726ade47058..289953725a3c 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,2 +1 @@
-DIST merginal-2.1.0.tar.gz 13510 BLAKE2B 
c44f3873f36ee540e69f1cd87558e2601f944f430d15ae0e863adbba5383637ddbae2bee01cf1f7788f677a159da7870a83b909562813f8817d610e85f9d4a96
 SHA512 
3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed
 DIST merginal-2.1.2.tar.gz 15156 BLAKE2B 
a8181ebd7aa67663b4541b5cb5028b6cadcca68c48f325dca07308ad13554d1d4b96b53f0a30e516cea732c880e68cb7e4cb7836b72cbd6b59a009e8d3c744b2
 SHA512 
70da5529ee22b3f06d83ecac62634d46d30472f064613a1844a7cdae31ed97366b5fcf6b31f4becd4cde246ccac32be6528c8c93ee2f02bdd32932388282f9bf

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..
--- 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} == "" ]] ; 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}"



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2022-06-01 Thread Jakov Smolić
commit: 95c017f2cfaf33985b964b9bab7848306d1a98e9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun  2 04:01:33 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun  2 04:02:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c017f2

app-vim/merginal: Stabilize 2.1.2 x86, #849197

Signed-off-by: Jakov Smolić  gentoo.org>

 app-vim/merginal/merginal-2.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-vim/merginal/merginal-2.1.2.ebuild 
b/app-vim/merginal/merginal-2.1.2.ebuild
index b8ced57b1e0e..0687eb030dca 100644
--- a/app-vim/merginal/merginal-2.1.2.ebuild
+++ b/app-vim/merginal/merginal-2.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; 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
 



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2022-06-01 Thread Jakov Smolić
commit: 7da05e10bd0ebf366910dcdc841b509500f71645
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun  2 03:57:49 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun  2 03:57:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da05e10

app-vim/merginal: Stabilize 2.1.2 amd64, #849197

Signed-off-by: Jakov Smolić  gentoo.org>

 app-vim/merginal/merginal-2.1.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-vim/merginal/merginal-2.1.2.ebuild 
b/app-vim/merginal/merginal-2.1.2.ebuild
index ddf93439f4e2..b8ced57b1e0e 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} == "" ]] ; 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
 



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2020-01-30 Thread Tim Harder
commit: 017a1f4f4de3b56406f693461cc143f358e01389
Author: Tim Harder  gentoo  org>
AuthorDate: Fri Jan 31 03:45:23 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Jan 31 03:49:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=017a1f4f

app-vim/merginal: version bump to 2.1.2

Signed-off-by: Tim Harder  gentoo.org>

 app-vim/merginal/Manifest| 1 +
 app-vim/merginal/{merginal-.ebuild => merginal-2.1.2.ebuild} | 4 ++--
 app-vim/merginal/merginal-.ebuild| 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index 137e14b70a3..f726ade4705 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1 +1,2 @@
 DIST merginal-2.1.0.tar.gz 13510 BLAKE2B 
c44f3873f36ee540e69f1cd87558e2601f944f430d15ae0e863adbba5383637ddbae2bee01cf1f7788f677a159da7870a83b909562813f8817d610e85f9d4a96
 SHA512 
3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed
+DIST merginal-2.1.2.tar.gz 15156 BLAKE2B 
a8181ebd7aa67663b4541b5cb5028b6cadcca68c48f325dca07308ad13554d1d4b96b53f0a30e516cea732c880e68cb7e4cb7836b72cbd6b59a009e8d3c744b2
 SHA512 
70da5529ee22b3f06d83ecac62634d46d30472f064613a1844a7cdae31ed97366b5fcf6b31f4becd4cde246ccac32be6528c8c93ee2f02bdd32932388282f9bf

diff --git a/app-vim/merginal/merginal-.ebuild 
b/app-vim/merginal/merginal-2.1.2.ebuild
similarity index 93%
copy from app-vim/merginal/merginal-.ebuild
copy to app-vim/merginal/merginal-2.1.2.ebuild
index fbe6b96d461..6d95e33ef10 100644
--- a/app-vim/merginal/merginal-.ebuild
+++ b/app-vim/merginal/merginal-2.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/merginal/merginal-.ebuild 
b/app-vim/merginal/merginal-.ebuild
index fbe6b96d461..6d95e33ef10 100644
--- a/app-vim/merginal/merginal-.ebuild
+++ b/app-vim/merginal/merginal-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit vim-plugin
 



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2018-12-23 Thread Patrice Clement
commit: 8fa8f22fff8510047f9e09382f8259d1ff304c0c
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Dec 20 20:23:46 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Dec 23 21:44:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa8f22f

app-vim/merginal: clean up old.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-vim/merginal/Manifest  |  1 -
 app-vim/merginal/merginal-2.0.2.ebuild | 26 --
 2 files changed, 27 deletions(-)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index 748f694aa0b..137e14b70a3 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,2 +1 @@
-DIST merginal-2.0.2.tar.gz 15048 BLAKE2B 
0c69f383ccb076e49b1ffcd7e74944c30b0d5e61054d636873a6391b39e4da6f1613f0f0a43d79b986a4681e4e7bd27a37f872e21a0e3df4520355a646a0adcf
 SHA512 
fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721
 DIST merginal-2.1.0.tar.gz 13510 BLAKE2B 
c44f3873f36ee540e69f1cd87558e2601f944f430d15ae0e863adbba5383637ddbae2bee01cf1f7788f677a159da7870a83b909562813f8817d610e85f9d4a96
 SHA512 
3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed

diff --git a/app-vim/merginal/merginal-2.0.2.ebuild 
b/app-vim/merginal/merginal-2.0.2.ebuild
deleted file mode 100644
index d74ee03f7bc..000
--- a/app-vim/merginal/merginal-2.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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}
-
-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/;
-SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-vim/fugitive"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   rm README.md || die
-   default
-}



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2018-12-23 Thread Patrice Clement
commit: 78971e049b03e5913042a4869a00673f18075941
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Dec 20 20:20:33 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Dec 23 21:44:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78971e04

app-vim/merginal: stable for amd64+x86.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-vim/merginal/merginal-2.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-vim/merginal/merginal-2.1.0.ebuild 
b/app-vim/merginal/merginal-2.1.0.ebuild
index fbe6b96d461..747a5ef9967 100644
--- a/app-vim/merginal/merginal-2.1.0.ebuild
+++ b/app-vim/merginal/merginal-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; 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
 



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2018-03-10 Thread Patrice Clement
commit: ad689a17f6d39dc346d5fbec3ea5ff686c7c5642
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Mar  5 21:04:47 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Mar 10 22:55:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad689a17

app-vim/merginal: use HTTPS

 app-vim/merginal/merginal-2.0.2.ebuild | 4 ++--
 app-vim/merginal/merginal-2.1.0.ebuild | 4 ++--
 app-vim/merginal/merginal-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-vim/merginal/merginal-2.0.2.ebuild 
b/app-vim/merginal/merginal-2.0.2.ebuild
index a6860bda0a0..d74ee03f7bc 100644
--- a/app-vim/merginal/merginal-2.0.2.ebuild
+++ b/app-vim/merginal/merginal-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_PN=vim-${PN}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
 SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 LICENSE="vim"
 KEYWORDS="amd64 x86"

diff --git a/app-vim/merginal/merginal-2.1.0.ebuild 
b/app-vim/merginal/merginal-2.1.0.ebuild
index 642e1deb87a..fbe6b96d461 100644
--- a/app-vim/merginal/merginal-2.1.0.ebuild
+++ b/app-vim/merginal/merginal-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
 LICENSE="vim"
 
 RDEPEND="app-vim/fugitive"

diff --git a/app-vim/merginal/merginal-.ebuild 
b/app-vim/merginal/merginal-.ebuild
index 642e1deb87a..fbe6b96d461 100644
--- a/app-vim/merginal/merginal-.ebuild
+++ b/app-vim/merginal/merginal-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
 LICENSE="vim"
 
 RDEPEND="app-vim/fugitive"



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2017-11-06 Thread Tim Harder
commit: ca4da3e450a388a0051c27034f27cd9d89d5edc5
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Nov  6 10:32:50 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Nov  6 10:32:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4da3e4

app-vim/merginal: version bump to 2.1.0

 app-vim/merginal/Manifest  |  1 +
 app-vim/merginal/merginal-2.1.0.ebuild | 31 +++
 2 files changed, 32 insertions(+)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index ea16dd790f9..ac8a391216a 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1 +1,2 @@
 DIST merginal-2.0.2.tar.gz 15048 SHA256 
e1f5030dfc30cf7c2c98f9193529c385c86def213ea2bc36c3feb5feea789a59 SHA512 
fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721
 WHIRLPOOL 
5101f0040f608370296fc57ab5b61be281c5190f9957dfbeb553714fa983434d22e8b866a60457a633e8ff89a4a49f4629bc20d47d310669708464065b966c9e
+DIST merginal-2.1.0.tar.gz 13510 SHA256 
742efa7ee598bcb605368faffa0082dcf329156f57768a32705ef9c5bd5292fe SHA512 
3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed
 WHIRLPOOL 
b8282b61017a53474291ae5b5438849c4e69d99cc8009a9bfd26c5bc53dcbd05fb296e5dbf06d82abfcbc2f384127edafac20c9f3c1414e4f4b425a47956606e

diff --git a/app-vim/merginal/merginal-2.1.0.ebuild 
b/app-vim/merginal/merginal-2.1.0.ebuild
new file mode 100644
index 000..642e1deb87a
--- /dev/null
+++ b/app-vim/merginal/merginal-2.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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} == "" ]] ; 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="http://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}"
+
+src_prepare() {
+   rm README.md || die
+   default
+}



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2017-08-17 Thread Tim Harder
commit: 499a205bc3cf29665c225e346e2c864957a1f18e
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 17 20:48:19 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 17 20:48:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499a205b

app-vim/merginal: add live ebuild

 app-vim/merginal/merginal-.ebuild | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/app-vim/merginal/merginal-.ebuild 
b/app-vim/merginal/merginal-.ebuild
new file mode 100644
index 000..642e1deb87a
--- /dev/null
+++ b/app-vim/merginal/merginal-.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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} == "" ]] ; 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="http://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}"
+
+src_prepare() {
+   rm README.md || die
+   default
+}



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2016-09-25 Thread Patrice Clement
commit: 6aca2001282764b5be086cdce153c34b0643b51a
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Sep 25 10:16:30 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Sep 25 19:06:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aca2001

app-vim/merginal: Stable for amd64. Retroactively mark stable for the remaining 
arches using the ALLARCHES policy.

Package-Manager: portage-2.2.28

 app-vim/merginal/merginal-2.0.2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-vim/merginal/merginal-2.0.2.ebuild 
b/app-vim/merginal/merginal-2.0.2.ebuild
index 522a797..df7d002 100644
--- a/app-vim/merginal/merginal-2.0.2.ebuild
+++ b/app-vim/merginal/merginal-2.0.2.ebuild
@@ -9,17 +9,17 @@ inherit vim-plugin
 MY_PN=vim-${PN}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="fugitive extension to manage and merge git branches"
+DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
 SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-vim/fugitive"
 
 VIM_PLUGIN_HELPFILES="${PN}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
rm README.md || die



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2016-08-17 Thread Tim Harder
commit: 568cdae220c84635e57bf46ede14e43da46473b4
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 18 05:12:35 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 18 05:12:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568cdae2

app-vim/merginal: remove old

 app-vim/merginal/Manifest  |  3 ---
 app-vim/merginal/merginal-1.6.0.ebuild | 26 --
 app-vim/merginal/merginal-2.0.0.ebuild | 26 --
 app-vim/merginal/merginal-2.0.1.ebuild | 26 --
 4 files changed, 81 deletions(-)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index 6c83f2e..ea16dd7 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,4 +1 @@
-DIST merginal-1.6.0.tar.gz 13882 SHA256 
c2badc8a95fe0706465faedddbc08ca4bc83aa412fe226d7032171e8fc39a23a SHA512 
9b3de15429160b4a2983f80c23483f7dee207586c89bbc70793b08639abff670762b54a4fac8f1bf907a0688ae4323876adcba29e3468f57ab0da57f5ce4105b
 WHIRLPOOL 
ff21e8228565707eb3cd794f48f68186f0da4a7f0412c61a762878718a617d6cb2de0b1beb769fe90162e50a80ac2feb494001e300d471bf78fe876c2185629f
-DIST merginal-2.0.0.tar.gz 14746 SHA256 
43648f6e7fc8b9ac2a4dc727fc87d53db5565f823c1323e99a4fbf7574b2ce07 SHA512 
9274749378981368c9afd6629b7b5bc0bd0e3153dda1a6828f43da31acd6e253637dd5703609a708b8b69dfe0d5a217d2414c36e947b985d97d341361fd4928e
 WHIRLPOOL 
591c0c1466e79f8c210fe6f0c347a66eb1ef7ae92c42e8928cf44c036a0f05150c03f3cb83969fe3faa2fa80290a79bea5298be0c13d0aac23667def7895cc87
-DIST merginal-2.0.1.tar.gz 14902 SHA256 
2b85e0e79e050f21e8a499253fe460c8dd5ae7f51b6a1d33296eafd8d1b4eb5e SHA512 
750a5842b44b11877929c656d9b26f1f693e3fa4bc26e40b75585e7d35b2c075bfd21742b11fff3a0cc9e87b32c01e1f75e3e5ab7b88aadf00ea5bd81f687534
 WHIRLPOOL 
ec81b2428447f0755788d8c4677379517e8914ce9a7fa5afc0442e6654cd49ecbb802482f0cf00c19de046a797f5c60c5ace0446e9d95a8a3f70a6001b7036ab
 DIST merginal-2.0.2.tar.gz 15048 SHA256 
e1f5030dfc30cf7c2c98f9193529c385c86def213ea2bc36c3feb5feea789a59 SHA512 
fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721
 WHIRLPOOL 
5101f0040f608370296fc57ab5b61be281c5190f9957dfbeb553714fa983434d22e8b866a60457a633e8ff89a4a49f4629bc20d47d310669708464065b966c9e

diff --git a/app-vim/merginal/merginal-1.6.0.ebuild 
b/app-vim/merginal/merginal-1.6.0.ebuild
deleted file mode 100644
index 1bea30c..000
--- a/app-vim/merginal/merginal-1.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit vim-plugin
-
-MY_PN=vim-${PN}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="fugitive extension to manage and merge git branches"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
-SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-vim/fugitive"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   rm README.md || die
-}

diff --git a/app-vim/merginal/merginal-2.0.0.ebuild 
b/app-vim/merginal/merginal-2.0.0.ebuild
deleted file mode 100644
index 1bea30c..000
--- a/app-vim/merginal/merginal-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit vim-plugin
-
-MY_PN=vim-${PN}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="fugitive extension to manage and merge git branches"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
-SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-vim/fugitive"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   rm README.md || die
-}

diff --git a/app-vim/merginal/merginal-2.0.1.ebuild 
b/app-vim/merginal/merginal-2.0.1.ebuild
deleted file mode 100644
index 1bea30c..000
--- a/app-vim/merginal/merginal-2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit vim-plugin
-
-MY_PN=vim-${PN}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="fugitive extension to manage and merge git branches"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
-SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-vim/fugitive"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   rm README.md || die
-}



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2016-07-20 Thread Tim Harder
commit: b9f5b7c6c2d57dbf3c4a62969fa82b32a02e2e11
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Jul 21 02:09:27 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Jul 21 02:09:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f5b7c6

app-vim/merginal: version bump to 2.0.2

 app-vim/merginal/Manifest  |  1 +
 app-vim/merginal/merginal-2.0.2.ebuild | 27 +++
 2 files changed, 28 insertions(+)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index d798809..6c83f2e 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,3 +1,4 @@
 DIST merginal-1.6.0.tar.gz 13882 SHA256 
c2badc8a95fe0706465faedddbc08ca4bc83aa412fe226d7032171e8fc39a23a SHA512 
9b3de15429160b4a2983f80c23483f7dee207586c89bbc70793b08639abff670762b54a4fac8f1bf907a0688ae4323876adcba29e3468f57ab0da57f5ce4105b
 WHIRLPOOL 
ff21e8228565707eb3cd794f48f68186f0da4a7f0412c61a762878718a617d6cb2de0b1beb769fe90162e50a80ac2feb494001e300d471bf78fe876c2185629f
 DIST merginal-2.0.0.tar.gz 14746 SHA256 
43648f6e7fc8b9ac2a4dc727fc87d53db5565f823c1323e99a4fbf7574b2ce07 SHA512 
9274749378981368c9afd6629b7b5bc0bd0e3153dda1a6828f43da31acd6e253637dd5703609a708b8b69dfe0d5a217d2414c36e947b985d97d341361fd4928e
 WHIRLPOOL 
591c0c1466e79f8c210fe6f0c347a66eb1ef7ae92c42e8928cf44c036a0f05150c03f3cb83969fe3faa2fa80290a79bea5298be0c13d0aac23667def7895cc87
 DIST merginal-2.0.1.tar.gz 14902 SHA256 
2b85e0e79e050f21e8a499253fe460c8dd5ae7f51b6a1d33296eafd8d1b4eb5e SHA512 
750a5842b44b11877929c656d9b26f1f693e3fa4bc26e40b75585e7d35b2c075bfd21742b11fff3a0cc9e87b32c01e1f75e3e5ab7b88aadf00ea5bd81f687534
 WHIRLPOOL 
ec81b2428447f0755788d8c4677379517e8914ce9a7fa5afc0442e6654cd49ecbb802482f0cf00c19de046a797f5c60c5ace0446e9d95a8a3f70a6001b7036ab
+DIST merginal-2.0.2.tar.gz 15048 SHA256 
e1f5030dfc30cf7c2c98f9193529c385c86def213ea2bc36c3feb5feea789a59 SHA512 
fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721
 WHIRLPOOL 
5101f0040f608370296fc57ab5b61be281c5190f9957dfbeb553714fa983434d22e8b866a60457a633e8ff89a4a49f4629bc20d47d310669708464065b966c9e

diff --git a/app-vim/merginal/merginal-2.0.2.ebuild 
b/app-vim/merginal/merginal-2.0.2.ebuild
new file mode 100644
index 000..522a797
--- /dev/null
+++ b/app-vim/merginal/merginal-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="fugitive extension to manage and merge git branches"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
+SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   rm README.md || die
+   default
+}



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2016-05-04 Thread Tim Harder
commit: 3e67f4163c6bcfc2fb69d4fdcf2ceef270dc5159
Author: Tim Harder  gentoo  org>
AuthorDate: Thu May  5 05:30:10 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu May  5 05:33:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e67f416

app-vim/merginal: version bump to 2.0.1

 app-vim/merginal/Manifest  |  1 +
 app-vim/merginal/merginal-2.0.1.ebuild | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index 3eaaf25..d798809 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1,2 +1,3 @@
 DIST merginal-1.6.0.tar.gz 13882 SHA256 
c2badc8a95fe0706465faedddbc08ca4bc83aa412fe226d7032171e8fc39a23a SHA512 
9b3de15429160b4a2983f80c23483f7dee207586c89bbc70793b08639abff670762b54a4fac8f1bf907a0688ae4323876adcba29e3468f57ab0da57f5ce4105b
 WHIRLPOOL 
ff21e8228565707eb3cd794f48f68186f0da4a7f0412c61a762878718a617d6cb2de0b1beb769fe90162e50a80ac2feb494001e300d471bf78fe876c2185629f
 DIST merginal-2.0.0.tar.gz 14746 SHA256 
43648f6e7fc8b9ac2a4dc727fc87d53db5565f823c1323e99a4fbf7574b2ce07 SHA512 
9274749378981368c9afd6629b7b5bc0bd0e3153dda1a6828f43da31acd6e253637dd5703609a708b8b69dfe0d5a217d2414c36e947b985d97d341361fd4928e
 WHIRLPOOL 
591c0c1466e79f8c210fe6f0c347a66eb1ef7ae92c42e8928cf44c036a0f05150c03f3cb83969fe3faa2fa80290a79bea5298be0c13d0aac23667def7895cc87
+DIST merginal-2.0.1.tar.gz 14902 SHA256 
2b85e0e79e050f21e8a499253fe460c8dd5ae7f51b6a1d33296eafd8d1b4eb5e SHA512 
750a5842b44b11877929c656d9b26f1f693e3fa4bc26e40b75585e7d35b2c075bfd21742b11fff3a0cc9e87b32c01e1f75e3e5ab7b88aadf00ea5bd81f687534
 WHIRLPOOL 
ec81b2428447f0755788d8c4677379517e8914ce9a7fa5afc0442e6654cd49ecbb802482f0cf00c19de046a797f5c60c5ace0446e9d95a8a3f70a6001b7036ab

diff --git a/app-vim/merginal/merginal-2.0.1.ebuild 
b/app-vim/merginal/merginal-2.0.1.ebuild
new file mode 100644
index 000..1bea30c
--- /dev/null
+++ b/app-vim/merginal/merginal-2.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="fugitive extension to manage and merge git branches"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
+SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   rm README.md || die
+}



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2016-04-09 Thread Tim Harder
commit: daa7821703b256916c0b5355518f5a3bd6ea934b
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Apr 10 05:16:06 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Apr 10 05:16:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa78217

app-vim/merginal: version bump to 2.0.0

 app-vim/merginal/Manifest  |  1 +
 app-vim/merginal/merginal-2.0.0.ebuild | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
index ca50d6e..3eaaf25 100644
--- a/app-vim/merginal/Manifest
+++ b/app-vim/merginal/Manifest
@@ -1 +1,2 @@
 DIST merginal-1.6.0.tar.gz 13882 SHA256 
c2badc8a95fe0706465faedddbc08ca4bc83aa412fe226d7032171e8fc39a23a SHA512 
9b3de15429160b4a2983f80c23483f7dee207586c89bbc70793b08639abff670762b54a4fac8f1bf907a0688ae4323876adcba29e3468f57ab0da57f5ce4105b
 WHIRLPOOL 
ff21e8228565707eb3cd794f48f68186f0da4a7f0412c61a762878718a617d6cb2de0b1beb769fe90162e50a80ac2feb494001e300d471bf78fe876c2185629f
+DIST merginal-2.0.0.tar.gz 14746 SHA256 
43648f6e7fc8b9ac2a4dc727fc87d53db5565f823c1323e99a4fbf7574b2ce07 SHA512 
9274749378981368c9afd6629b7b5bc0bd0e3153dda1a6828f43da31acd6e253637dd5703609a708b8b69dfe0d5a217d2414c36e947b985d97d341361fd4928e
 WHIRLPOOL 
591c0c1466e79f8c210fe6f0c347a66eb1ef7ae92c42e8928cf44c036a0f05150c03f3cb83969fe3faa2fa80290a79bea5298be0c13d0aac23667def7895cc87

diff --git a/app-vim/merginal/merginal-2.0.0.ebuild 
b/app-vim/merginal/merginal-2.0.0.ebuild
new file mode 100644
index 000..1bea30c
--- /dev/null
+++ b/app-vim/merginal/merginal-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="fugitive extension to manage and merge git branches"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
+SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   rm README.md || die
+}



[gentoo-commits] repo/gentoo:master commit in: app-vim/merginal/

2016-04-01 Thread Tim Harder
commit: fbde40cdcdbbc7934b6f697484764d7d20b5840e
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Apr  2 04:18:37 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Apr  2 04:19:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbde40cd

app-vim/merginal: initial import

 app-vim/merginal/Manifest  |  1 +
 app-vim/merginal/merginal-1.6.0.ebuild | 26 ++
 app-vim/merginal/metadata.xml  | 11 +++
 3 files changed, 38 insertions(+)

diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
new file mode 100644
index 000..ca50d6e
--- /dev/null
+++ b/app-vim/merginal/Manifest
@@ -0,0 +1 @@
+DIST merginal-1.6.0.tar.gz 13882 SHA256 
c2badc8a95fe0706465faedddbc08ca4bc83aa412fe226d7032171e8fc39a23a SHA512 
9b3de15429160b4a2983f80c23483f7dee207586c89bbc70793b08639abff670762b54a4fac8f1bf907a0688ae4323876adcba29e3468f57ab0da57f5ce4105b
 WHIRLPOOL 
ff21e8228565707eb3cd794f48f68186f0da4a7f0412c61a762878718a617d6cb2de0b1beb769fe90162e50a80ac2feb494001e300d471bf78fe876c2185629f

diff --git a/app-vim/merginal/merginal-1.6.0.ebuild 
b/app-vim/merginal/merginal-1.6.0.ebuild
new file mode 100644
index 000..1bea30c
--- /dev/null
+++ b/app-vim/merginal/merginal-1.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="fugitive extension to manage and merge git branches"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 
https://github.com/idanarye/vim-merginal/;
+SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   rm README.md || die
+}

diff --git a/app-vim/merginal/metadata.xml b/app-vim/merginal/metadata.xml
new file mode 100644
index 000..bd94d1e
--- /dev/null
+++ b/app-vim/merginal/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+v...@gentoo.org
+Gentoo Vim Project
+  
+  
+idanarye/vim-merginal
+  
+