1 |
commit: 68452c97485ce39e9639b16816740e7ace19eb3b |
2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 8 17:14:03 2016 +0000 |
4 |
Commit: Austin English <wizardedit <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 8 17:57:42 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68452c97 |
7 |
|
8 |
dev-vcs/git-imerge: bump to EAPI 6, add maintainer-needed |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild | 38 +++++++++++++++++++++++++++ |
13 |
dev-vcs/git-imerge/metadata.xml | 1 + |
14 |
2 files changed, 39 insertions(+) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 0000000..a80c48a |
19 |
--- /dev/null |
20 |
+++ b/dev-vcs/git-imerge/git-imerge-0.7.0-r1.ebuild |
21 |
@@ -0,0 +1,38 @@ |
22 |
+# Copyright 1999-2016 Gentoo Foundation |
23 |
+# Distributed under the terms of the GNU General Public License v2 |
24 |
+# $Id$ |
25 |
+ |
26 |
+EAPI=6 |
27 |
+ |
28 |
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) |
29 |
+ |
30 |
+inherit bash-completion-r1 python-r1 |
31 |
+ |
32 |
+DESCRIPTION="Incremental merge for git" |
33 |
+HOMEPAGE="https://github.com/mhagger/git-imerge" |
34 |
+SRC_URI="https://github.com/mhagger/git-imerge/archive/${PV}.tar.gz -> ${P}.tar.gz" |
35 |
+ |
36 |
+LICENSE="GPL-2+" |
37 |
+SLOT="0" |
38 |
+KEYWORDS="~amd64 ~x86" |
39 |
+IUSE="" |
40 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
41 |
+ |
42 |
+RDEPEND="${PYTHON_DEPS} |
43 |
+ dev-vcs/git" |
44 |
+DEPEND="dev-python/docutils" |
45 |
+ |
46 |
+src_compile() { |
47 |
+ rst2html.py README.rst > README.html || die |
48 |
+ rst2s5.py \ |
49 |
+ --theme=small-white \ |
50 |
+ --current-slide \ |
51 |
+ doc/presentations/GitMerge-2013/talk.rst doc/presentations/GitMerge-2013/talk.html || die |
52 |
+} |
53 |
+ |
54 |
+src_install() { |
55 |
+ dobin ${PN} |
56 |
+ python_replicate_script "${D}"/usr/bin/${PN} |
57 |
+ newbashcomp "${FILESDIR}"/git-imerge.bashcomplete git-imerge |
58 |
+ dodoc README.rst README.html doc/presentations/GitMerge-2013/talk.html |
59 |
+} |
60 |
|
61 |
diff --git a/dev-vcs/git-imerge/metadata.xml b/dev-vcs/git-imerge/metadata.xml |
62 |
index 1ea8f01..33aa113 100644 |
63 |
--- a/dev-vcs/git-imerge/metadata.xml |
64 |
+++ b/dev-vcs/git-imerge/metadata.xml |
65 |
@@ -1,6 +1,7 @@ |
66 |
<?xml version="1.0" encoding="UTF-8"?> |
67 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
68 |
<pkgmetadata> |
69 |
+ <!-- maintainer-needed --> |
70 |
<upstream> |
71 |
<remote-id type="github">mhagger/git-imerge</remote-id> |
72 |
</upstream> |