From fbc0a1cc52b08173f049388291da8d42b8bb5fc2 Mon Sep 17 00:00:00 2001
From: Louis Sautier <sautier.louis@gmail.com>
Date: Sun, 11 Dec 2016 02:42:41 +0100
Subject: dev-python/meld3: add py3.5, EAPI=6, fix license, deps and tests

Closes: https://github.com/gentoo/gentoo/pull/3074
Package-Manager: portage-2.3.2
---
 dev-python/meld3/meld3-1.0.2-r1.ebuild | 22 ++++++++++++++++++++++
 dev-python/meld3/meld3-1.0.2.ebuild    | 27 ---------------------------
 dev-python/meld3/metadata.xml          |  3 ++-
 3 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 dev-python/meld3/meld3-1.0.2-r1.ebuild
 delete mode 100644 dev-python/meld3/meld3-1.0.2.ebuild

diff --git a/dev-python/meld3/meld3-1.0.2-r1.ebuild b/dev-python/meld3/meld3-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..8975dde39249
--- /dev/null
+++ b/dev-python/meld3/meld3-1.0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="meld3 is an HTML/XML templating engine"
+HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.python.org/pypi/meld3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/meld3/meld3-1.0.2.ebuild b/dev-python/meld3/meld3-1.0.2.ebuild
deleted file mode 100644
index 6919603debb6..000000000000
--- a/dev-python/meld3/meld3-1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-# tests use a local path.
-RESTRICT=test
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" ${PN}/test_${PN}.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/meld3/metadata.xml b/dev-python/meld3/metadata.xml
index ae6ed43b4ecb..0fa59babf6c5 100644
--- a/dev-python/meld3/metadata.xml
+++ b/dev-python/meld3/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">meld3</remote-id>
-    <remote-id type="github">supervisor/meld3</remote-id>
+    <remote-id type="github">Supervisor/meld3</remote-id>
+    <bugs-to>https://github.com/Supervisor/meld3/issues</bugs-to>
   </upstream>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad