summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2017-05-05 19:15:43 -0400
committerMichael Orlitzky <mjo@gentoo.org>2017-05-05 19:15:43 -0400
commita7fd11fb3319f9d2cff549dd9f66f03d9b5fa4cc (patch)
tree471b74728c8ae220ae42b1596b4c111239986af4 /dev-vcs/git-imerge
parentdev-vcs/git-imerge: remove unused version 0.7.0. (diff)
downloadgentoo-a7fd11fb3319f9d2cff549dd9f66f03d9b5fa4cc.tar.gz
gentoo-a7fd11fb3319f9d2cff549dd9f66f03d9b5fa4cc.tar.bz2
gentoo-a7fd11fb3319f9d2cff549dd9f66f03d9b5fa4cc.zip
dev-vcs/git-imerge: new version 1.0.0.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-vcs/git-imerge')
-rw-r--r--dev-vcs/git-imerge/Manifest2
-rw-r--r--dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild37
-rw-r--r--dev-vcs/git-imerge/git-imerge-1.0.0.ebuild45
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"
+}