Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-python/meld3
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2014-12-04 17:24:24 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2014-12-04 17:24:24 +0000
commit1e4d54d8dbeac220940a4e90ec365cddd9d2ed9f (patch)
tree4b49b39d0a015496e46f8feed2f47872eb0778ee /dev-python/meld3
parentWhitespace. (diff)
downloadgentoo-2-1e4d54d8dbeac220940a4e90ec365cddd9d2ed9f.tar.gz
gentoo-2-1e4d54d8dbeac220940a4e90ec365cddd9d2ed9f.tar.bz2
gentoo-2-1e4d54d8dbeac220940a4e90ec365cddd9d2ed9f.zip
Properly depend on setuptools wrt #528740 by Toralf Förster <toralf.foerster@gmx.de>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
Diffstat (limited to 'dev-python/meld3')
-rw-r--r--dev-python/meld3/ChangeLog8
-rw-r--r--dev-python/meld3/files/meld3_tests.patch20
-rw-r--r--dev-python/meld3/meld3-0.6.10-r1.ebuild24
-rw-r--r--dev-python/meld3/meld3-0.6.10.ebuild29
-rw-r--r--dev-python/meld3/meld3-0.6.7.ebuild32
-rw-r--r--dev-python/meld3/meld3-0.6.8.ebuild37
-rw-r--r--dev-python/meld3/meld3-0.6.9-r1.ebuild21
-rw-r--r--dev-python/meld3/meld3-1.0.0.ebuild6
8 files changed, 12 insertions, 165 deletions
diff --git a/dev-python/meld3/ChangeLog b/dev-python/meld3/ChangeLog
index e80b6f4f25f5..042a07271cba 100644
--- a/dev-python/meld3/ChangeLog
+++ b/dev-python/meld3/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/meld3
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/ChangeLog,v 1.15 2014/08/10 21:13:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/ChangeLog,v 1.16 2014/12/04 17:24:24 xarthisius Exp $
+
+ 04 Dec 2014; Kacper Kowalik <xarthisius@gentoo.org> -files/meld3_tests.patch,
+ -meld3-0.6.10-r1.ebuild, -meld3-0.6.10.ebuild, -meld3-0.6.7.ebuild,
+ -meld3-0.6.8.ebuild, -meld3-0.6.9-r1.ebuild, meld3-1.0.0.ebuild:
+ Properly depend on setuptools wrt #528740 by Toralf Förster
+ <toralf.foerster@gmx.de>
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> meld3-0.6.10-r1.ebuild,
meld3-0.6.10.ebuild, meld3-0.6.7.ebuild, meld3-0.6.8.ebuild,
diff --git a/dev-python/meld3/files/meld3_tests.patch b/dev-python/meld3/files/meld3_tests.patch
deleted file mode 100644
index 21fcd1717687..000000000000
--- a/dev-python/meld3/files/meld3_tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/Supervisor/meld3/issues/2
-https://bugs.gentoo.org/show_bug.cgi?id=429412
-
---- a/meld3/test_meld3.py
-+++ b/meld3/test_meld3.py
-@@ -1672,13 +1672,10 @@ class WriterTests(unittest.TestCase):
- </html>"""
-
- def test_unknown_entity(self):
-- if sys.version_info[:3] >= (2,7,0):
-- self.assertRaises(SyntaxError, self._parse,
-- '<html><head></head><body>&fleeb;</body></html>')
-- else:
-- from xml.parsers import expat
-- self.assertRaises(expat.error, self._parse,
-- '<html><head></head><body>&fleeb;</body></html>')
-+ # exception thrown may vary by python or expat version
-+ from xml.parsers import expat
-+ self.assertRaises((expat.error, SyntaxError), self._parse,
-+ '<html><head></head><body>&fleeb;</body></html>')
diff --git a/dev-python/meld3/meld3-0.6.10-r1.ebuild b/dev-python/meld3/meld3-0.6.10-r1.ebuild
deleted file mode 100644
index c649dd1933a3..000000000000
--- a/dev-python/meld3/meld3-0.6.10-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.10-r1.ebuild,v 1.3 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( CHANGES.txt README.txt TODO.txt )
-
-python_test() {
- "${PYTHON}" "${S}/meld3/test_${PN}.py" || die "tests failed with ${PYTHON}"
-}
diff --git a/dev-python/meld3/meld3-0.6.10.ebuild b/dev-python/meld3/meld3-0.6.10.ebuild
deleted file mode 100644
index a301525bf093..000000000000
--- a/dev-python/meld3/meld3-0.6.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.10.ebuild,v 1.2 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt TODO.txt"
-
-src_test() {
- cd ${PN}
- testing() {
- "$(PYTHON)" test_${PN}.py
- }
- python_execute_function testing
-}
diff --git a/dev-python/meld3/meld3-0.6.7.ebuild b/dev-python/meld3/meld3-0.6.7.ebuild
deleted file mode 100644
index 9722eb89a88c..000000000000
--- a/dev-python/meld3/meld3-0.6.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.7.ebuild,v 1.3 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://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=""
-RDEPEND=""
-
-DOCS="CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt TODO.txt"
-
-src_test() {
- cd meld3
- testing() {
- "$(PYTHON)" test_meld3.py
- }
- python_execute_function testing
-}
diff --git a/dev-python/meld3/meld3-0.6.8.ebuild b/dev-python/meld3/meld3-0.6.8.ebuild
deleted file mode 100644
index 5db4fa529dfc..000000000000
--- a/dev-python/meld3/meld3-0.6.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.8.ebuild,v 1.4 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://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=""
-RDEPEND=""
-
-DOCS="CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt TODO.txt"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}_tests.patch
- distutils_src_prepare
-}
-
-src_test() {
- cd ${PN}
- testing() {
- "$(PYTHON)" test_${PN}.py
- }
- python_execute_function testing
-}
diff --git a/dev-python/meld3/meld3-0.6.9-r1.ebuild b/dev-python/meld3/meld3-0.6.9-r1.ebuild
deleted file mode 100644
index 7203d99b53a1..000000000000
--- a/dev-python/meld3/meld3-0.6.9-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.9-r1.ebuild,v 1.4 2014/08/10 21:13:49 slyfox Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-python_test() {
- "${PYTHON}" ${PN}/test_${PN}.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/meld3/meld3-1.0.0.ebuild b/dev-python/meld3/meld3-1.0.0.ebuild
index bc383c0432ed..38ff271b7876 100644
--- a/dev-python/meld3/meld3-1.0.0.ebuild
+++ b/dev-python/meld3/meld3-1.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-1.0.0.ebuild,v 1.2 2014/08/10 21:13:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-1.0.0.ebuild,v 1.3 2014/12/04 17:24:24 xarthisius Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -15,6 +15,10 @@ LICENSE="ZPL"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
# tests use a local path.
RESTRICT=test