* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-imerge/
@ 2015-08-14 21:05 Julian Ospald
0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald @ 2015-08-14 21:05 UTC (permalink / raw
To: gentoo-commits
commit: eae32f4674f432392facb01e2dffbf0e9dc611b2
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 21:05:41 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 21:05:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae32f46
dev-vcs/git-imerge: add dev-vcs/git to RDEPEND
dev-vcs/git-imerge/git-imerge-0.7.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild b/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild
index 1b45ef0..8013aa2 100644
--- a/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild
+++ b/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+ dev-vcs/git"
DEPEND="dev-python/docutils"
src_compile() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-imerge/
@ 2015-08-16 15:10 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2015-08-16 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 26ed8b4d4adc2950e472d8fa1cae3a786ef6d211
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 15:02:31 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 15:10:33 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ed8b4d
dev-vcs/git-imerge: Updating remote-id in metadata.xml
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-vcs/git-imerge/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-vcs/git-imerge/metadata.xml b/dev-vcs/git-imerge/metadata.xml
index a309a9b..4370ba6 100644
--- a/dev-vcs/git-imerge/metadata.xml
+++ b/dev-vcs/git-imerge/metadata.xml
@@ -5,4 +5,7 @@
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">mhagger/git-imerge</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-imerge/
@ 2016-07-08 17:58 Austin English
0 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2016-07-08 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 68452c97485ce39e9639b16816740e7ace19eb3b
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 8 17:14:03 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 17:57:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68452c97
dev-vcs/git-imerge: bump to EAPI 6, add maintainer-needed
Package-Manager: portage-2.2.28
dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild | 38 +++++++++++++++++++++++++++
dev-vcs/git-imerge/metadata.xml | 1 +
2 files changed, 39 insertions(+)
diff --git a/dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild b/dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild
new file mode 100644
index 0000000..a80c48a
--- /dev/null
+++ b/dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit bash-completion-r1 python-r1
+
+DESCRIPTION="Incremental merge for git"
+HOMEPAGE="https://github.com/mhagger/git-imerge"
+SRC_URI="https://github.com/mhagger/git-imerge/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-vcs/git"
+DEPEND="dev-python/docutils"
+
+src_compile() {
+ rst2html.py README.rst > README.html || die
+ rst2s5.py \
+ --theme=small-white \
+ --current-slide \
+ doc/presentations/GitMerge-2013/talk.rst doc/presentations/GitMerge-2013/talk.html || die
+}
+
+src_install() {
+ dobin ${PN}
+ python_replicate_script "${D}"/usr/bin/${PN}
+ newbashcomp "${FILESDIR}"/git-imerge.bashcomplete git-imerge
+ dodoc README.rst README.html doc/presentations/GitMerge-2013/talk.html
+}
diff --git a/dev-vcs/git-imerge/metadata.xml b/dev-vcs/git-imerge/metadata.xml
index 1ea8f01..33aa113 100644
--- a/dev-vcs/git-imerge/metadata.xml
+++ b/dev-vcs/git-imerge/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">mhagger/git-imerge</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-imerge/
@ 2017-05-05 23:22 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2017-05-05 23:22 UTC (permalink / raw
To: gentoo-commits
commit: d02e1cf834730be1673e7376ee540532821e250c
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 22:50:47 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri May 5 22:50:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02e1cf8
dev-vcs/git-imerge: remove unused version 0.7.0.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-vcs/git-imerge/git-imerge-0.7.0.ebuild | 38 ------------------------------
1 file changed, 38 deletions(-)
diff --git a/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild b/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild
deleted file mode 100644
index 3b7e0a10752..00000000000
--- a/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit bash-completion-r1 python-r1
-
-DESCRIPTION="Incremental merge for git"
-HOMEPAGE="https://github.com/mhagger/git-imerge"
-SRC_URI="https://github.com/mhagger/git-imerge/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-vcs/git"
-DEPEND="dev-python/docutils"
-
-src_compile() {
- rst2html.py README.rst > README.html || die
- rst2s5.py \
- --theme=small-white \
- --current-slide \
- doc/presentations/GitMerge-2013/talk.rst doc/presentations/GitMerge-2013/talk.html || die
-}
-
-src_install() {
- dobin ${PN}
- python_replicate_script "${D}"/usr/bin/${PN}
- newbashcomp "${FILESDIR}"/git-imerge.bashcomplete git-imerge
- dodoc README.rst
- dohtml README.html doc/presentations/GitMerge-2013/talk.html
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-imerge/
@ 2017-05-05 23:22 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2017-05-05 23:22 UTC (permalink / raw
To: gentoo-commits
commit: a7fd11fb3319f9d2cff549dd9f66f03d9b5fa4cc
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 23:15:43 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri May 5 23:15:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fd11fb
dev-vcs/git-imerge: new version 1.0.0.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-vcs/git-imerge/Manifest | 2 +-
dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild | 37 ----------------------
dev-vcs/git-imerge/git-imerge-1.0.0.ebuild | 45 +++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/dev-vcs/git-imerge/Manifest b/dev-vcs/git-imerge/Manifest
index ee278c952ec..fd9f64a2c16 100644
--- a/dev-vcs/git-imerge/Manifest
+++ b/dev-vcs/git-imerge/Manifest
@@ -1 +1 @@
-DIST git-imerge-0.7.0.tar.gz 52040 SHA256 0688fe4c13c65c6fa90989c57c04fafe34114889d2d100b6e62538e8f2b0dc02 SHA512 140fd1b056097ff59848c4312ca02a1bd9ff136b7680e25b8575d3824c9b189fb2f8de2b5100966f774f003bb538f1e649e758edf5ab4bd3b1f9b824645738c4 WHIRLPOOL ab8e412039b82d2d057cba7c4ffe3a392653e88cb2b0492cd7a1da57896e59115c5e4d737b6389ddcf177d0c30ef4d4dc0722d9dc16bd93f6647016ff488588f
+DIST git-imerge-1.0.0.tar.gz 58736 SHA256 2ef3a49a6d54c4248ef2541efc3c860824fc8295a7226760f24f0bb2c5dd41f2 SHA512 919b80f157d635e3a3eb2b05cfaf8f6a7034fe6f43529c829fef0152007bce3bf5b296cc00f6db0c0a711bfb9e118c4adb0f5a2641ff841c973ff12610473e9b WHIRLPOOL a347f139d8aec6c616805632385e3466283a778f40a2a87d817c510258f34ada22669209547d282a7d510ad2d56047eb75e8becd138cd7b6dd3b322c5ac9896e
diff --git a/dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild b/dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild
deleted file mode 100644
index 5a4204855ea..00000000000
--- a/dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit bash-completion-r1 python-r1
-
-DESCRIPTION="Incremental merge for git"
-HOMEPAGE="https://github.com/mhagger/git-imerge"
-SRC_URI="https://github.com/mhagger/git-imerge/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-vcs/git"
-DEPEND="dev-python/docutils"
-
-src_compile() {
- rst2html.py README.rst > README.html || die
- rst2s5.py \
- --theme=small-white \
- --current-slide \
- doc/presentations/GitMerge-2013/talk.rst doc/presentations/GitMerge-2013/talk.html || die
-}
-
-src_install() {
- dobin ${PN}
- python_replicate_script "${D}"/usr/bin/${PN}
- newbashcomp "${FILESDIR}"/git-imerge.bashcomplete git-imerge
- dodoc README.rst README.html doc/presentations/GitMerge-2013/talk.html
-}
diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
new file mode 100644
index 00000000000..cd805b4ba98
--- /dev/null
+++ b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit bash-completion-r1 python-r1
+
+DESCRIPTION="Incremental merge for git"
+HOMEPAGE="https://github.com/mhagger/git-imerge"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-vcs/git"
+DEPEND="dev-python/docutils"
+
+src_compile() {
+ for doc in *.rst; do
+ rst2html.py "${doc}" > "${T}/${doc/.rst/.html}" \
+ || die "failed to convert ${doc} to ${T}/${doc/.rst/.html}"
+ done
+
+ rst2s5.py \
+ --theme=small-white \
+ --current-slide \
+ doc/presentations/GitMerge-2013/talk.rst \
+ "${T}/talk.html" \
+ || die 'failed to convert talk.rst to ${T}/talk.html'
+}
+
+src_install() {
+ python_foreach_impl python_doscript "${PN}"
+ newbashcomp "${FILESDIR}/git-imerge.bashcomplete" git-imerge
+ dodoc *.rst "${T}"/*.html
+
+ # Don't forget the CSS for the presentation.
+ dodoc -r "${T}/ui"
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-imerge/
@ 2017-05-28 11:14 Pacho Ramos
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2017-05-28 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 56bba81be864e2d0d3a9cde2f78e9d0d383bcf1c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 10:48:30 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 28 10:48:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56bba81b
dev-vcs/git-imerge: Support newer python
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-vcs/git-imerge/git-imerge-1.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
index cd805b4ba98..249da409f76 100644
--- a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
+++ b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit bash-completion-r1 python-r1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-imerge/
@ 2020-02-10 21:00 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2020-02-10 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 8d809b12862c2160a5c8ddae8296b6fddebcd64c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 20:56:32 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 21:00:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d809b12
dev-vcs/git-imerge: Remove py2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-vcs/git-imerge/git-imerge-1.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
index 3604eecc79b..424d661ab00 100644
--- a/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
+++ b/dev-vcs/git-imerge/git-imerge-1.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit bash-completion-r1 python-r1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-02-10 21:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-28 11:14 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-imerge/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-02-10 21:00 Michał Górny
2017-05-05 23:22 Michael Orlitzky
2017-05-05 23:22 Michael Orlitzky
2016-07-08 17:58 Austin English
2015-08-16 15:10 Justin Lecher
2015-08-14 21:05 Julian Ospald
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox