dev-vcs/git-imerge: bump to EAPI 6, add maintainer-needed

Package-Manager: portage-2.2.28

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 (file)
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 1ea8f0177e5359c174a999fcbb4113ec4049b554..33aa1137112cfb36f31947eecfbd8218ce58cabb 100644 (file)
--- 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>