dev-python/pyicu: Version bump, using new python eclasses

diff --git a/dev-python/pyicu/ChangeLog b/dev-python/pyicu/ChangeLog
index 53ddf25f463290efd36ecdc5df25ddd03feb1702..23e82f226e1b35fd3615ea4f2e4d5ba6e1e493fc 100644 (file)
--- a/dev-python/pyicu/ChangeLog
+++ b/dev-python/pyicu/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-python/pyicu
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pyicu-1.5 (06 Jan 2013)
+
+  06 Jan 2013; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+  -pyicu-1.4.ebuild, +pyicu-1.5.ebuild, +files/pyicu-1.5-testPre27.patch:
+  Version bump, using new python eclasses
+
 *pyicu-1.4 (26 May 2012)
 
   26 May 2012; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 38ebeb48fe44f8b49ff8a30f79a0b933ff6364a0..2b027ebe5425125353d6326bcc9898708962ddeb 100644 (file)
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,4 +1,5 @@
-DIST PyICU-1.4.tar.gz 209539 RMD160 2b5e2570f478838d3abb0fd8a8885174c42c8c12 SHA1 70ea51543d5e684b1466d3cf6d3c7a6ee115ed4e SHA256 69737464b763c547ab237fc8f77dabad2f11fa23337a0cb4404c211e2a5f53de
-EBUILD pyicu-1.4.ebuild 1506 RMD160 38033f7591c8790134231e97b2e49363c76e0d57 SHA1 8df655c4e5d465583ba91ea8ed02bdf4477dfeac SHA256 43f5608ca16948c178c8d95bd8bbcf4fd99c345c2cc81541675b66c0ed975fb9
-MISC ChangeLog 1924 RMD160 ce8d9ff90e60dac289e7c0c9d8f031f72aa0bb1f SHA1 e4e72ab7e471c27a529584d6cde0ea6099dc299b SHA256 e9ade4dc4eeab6b6783bf28aa64605a572d48f24027456bbc810070750fb3be6
-MISC metadata.xml 499 RMD160 af4f88a565517083006955a9b06ccdb2ebc82c3c SHA1 b21eb17caffeabee4fa966b2205562680615eee5 SHA256 fc8bc8371e734428b86d929279626a1b8445625299a2a477dd54806ab7ac5f6b
+AUX pyicu-1.5-testPre27.patch 709 SHA256 ca3f862c4aae92d5cab3cb22dacefd8238990ff173e77de48152739c62e8423f SHA512 749ff68abe408aeaed0299b183b2a08fbc840654cfbe41c3d10322389d2bb723965cc5db429b751e1cb762b1dd5ea7bf4816b29d6145a739da9ba96168ed9fea WHIRLPOOL 31f8d53987d25d3a6cf26eb17e8dfee0cdfe5e3e2b106d570172273086930f7fa1dced0355a977393599b946c18c6a9a0d336ae159aee5e2dbdbb9134ef7dd12
+DIST PyICU-1.5.tar.gz 207257 SHA256 7597ae80f8bbfed5ff321c6c3ed7200ef07d546a26ee8a08dc1ce578a9e33b04 SHA512 c196d65a5d112c2a720a10082fe461195858b87b03d5273facc13bb711a1c42264eec7899af52d71d783f35ad19e735fc74ffe994a1369ebf5550b58115c5e6e WHIRLPOOL ac423a66ac58f2e787c850a4e714eab9562a19764090873c138b34e1921e006d94c5d8f485a949893a82902505960275f57d1064a99f0a7d2fddad300d898925
+EBUILD pyicu-1.5.ebuild 1062 SHA256 a3f3a70eacfab6ddcc202d8e00cae0648e064d53d2ddef60cc2a7c905faee268 SHA512 ca00b8f660b022583606ca7e9c8c4181faee78a7c5ef04dec6cd298d9f53337b32c94e6f7cdec2113b1d9e0c8c14f99bad35db107a347a7542a4855612b81207 WHIRLPOOL abc10dd5d82a416c9ec8f2d874dad8ec3e19b449d9b434d0de7be6794654de215108eecfef26b17f3cac503bbc31e3a251c110e04612d04cf347368b0a857e21
+MISC ChangeLog 2131 SHA256 8e4afd2630a135468bc5eddcc76065f750df0a53ff59ae73dd1c57caf4a1cafa SHA512 219fe9003889dddcf40a472697a13c2e9526d806e7e7c90f2360ef59a5bcd5dd08e0a39744409ba0f3223bbca8e02244607d46df03365085357020d9060d0e7f WHIRLPOOL 403a7a3a5d859f60f984c143f477e67d4a5ca955f97d2be4be75d0acb304821ad0c25ee9a7222952402b2ad83a18b5dc16827f37ead7e0aabe9c2d813c38bd19
+MISC metadata.xml 499 SHA256 fc8bc8371e734428b86d929279626a1b8445625299a2a477dd54806ab7ac5f6b SHA512 f898dc7d404fe6674a69f51d31866ec4e0b779385cab9b061eb647a9694db3c74ed2b523bef83e8793ae71724405a8f5aeb1a2fc3e52f7727e7e0b5b8a09db7b WHIRLPOOL be6bae045fabb3f5a358207605fac9703d360829f1c114f214915f2d9d32b100b41fc5dfa5154a6f2388f42dbea3ddd24f2c0b5b3aab63015450929dd478c98a

diff --git a/dev-python/pyicu/files/pyicu-1.5-testPre27.patch b/dev-python/pyicu/files/pyicu-1.5-testPre27.patch
new file mode 100644 (file)
index 0000000..a674731
--- /dev/null
+++ b/dev-python/pyicu/files/pyicu-1.5-testPre27.patch
@@ -0,0 +1,20 @@
+Prevent the test suite from requiring python 2.7 or later.
+
+2013-01-06 Martin von Gagern
+
+References:
+https://bugzilla.osafoundation.org/show_bug.cgi?id=13075
+
+Index: PyICU-1.5/test/test_Collator.py
+===================================================================
+--- PyICU-1.5.orig/test/test_Collator.py
++++ PyICU-1.5/test/test_Collator.py
+@@ -92,7 +92,7 @@ class TestCollator(TestCase):
+         self.assertEqual(-1, collator.compare(hira_ge, kana_ge))
+         hira_ge_key = collator.getSortKey(hira_ge)
+         kana_ge_key = collator.getSortKey(kana_ge)
+-        self.assertLess(hira_ge_key, kana_ge_key)
++        self.assertTrue(hira_ge_key < kana_ge_key)
+ 
+     def setupCollator(self, collator):
+ 

diff --git a/dev-python/pyicu/pyicu-1.4.ebuild b/dev-python/pyicu/pyicu-1.4.ebuild
deleted file mode 100644 (file)
index ecc89ac..0000000
--- a/dev-python/pyicu/pyicu-1.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="*-jython"
-DISTUTILS_SRC_TEST=setup.py
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1 # setup.py applies 2to3 to tests
-
-inherit base distutils
-
-MY_PN="PyICU"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="http://pyicu.osafoundation.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/icu"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/epydoc )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES CREDITS"
-
-src_prepare() {
-       base_src_prepare
-       distutils_src_prepare
-}
-
-src_compile() {
-       distutils_src_compile
-       if use doc; then
-               local doc_abi abi
-               for abi in ${PYTHON_ABIS}; do
-                       # Find latest 2.* ABI, fall back to latest ABI if there is no 2.*
-                       if [[ ${abi} == 2* ]] || [[ ${doc_abi} != 2* ]]; then
-                               doc_abi=${abi}
-                       fi
-               done
-               local epydoc=epydoc-${doc_abi}
-               [[ -x ${EPREFIX}/usr/bin/${epydoc} ]] || epydoc=epydoc
-               echo " * Making documentation from ${doc_abi} build using ${epydoc}"
-               cd "${S}-${doc_abi}"
-               PYTHON_ABI=${doc_abi}
-               PYTHONPATH=$(_distutils_get_PYTHONPATH) \
-                       ${epydoc} --html --verbose \
-                       --url="${HOMEPAGE}" --name="${MY_P}" \
-                       icu.py || die "Making the docs failed!"
-       fi
-}
-
-src_install() {
-       distutils_src_install
-       if use doc; then
-               dohtml -r ../*/html/* || die "Installing the docs failed!"
-       fi
-}

diff --git a/dev-python/pyicu/pyicu-1.5.ebuild b/dev-python/pyicu/pyicu-1.5.ebuild
new file mode 100644 (file)
index 0000000..47fc0bf
--- /dev/null
+++ b/dev-python/pyicu/pyicu-1.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="http://pyicu.osafoundation.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/icu"
+DEPEND="${RDEPEND}
+       doc? ( dev-python/epydoc )"
+
+PATCHES=(
+       "${FILESDIR}/${P}-testPre27.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README)
+
+python_compile_all() {
+       if use doc; then
+               einfo "Making documentation from ${EPYTHON} build"
+               cd "${BEST_BUILD_DIR}" || die
+               epydoc --html --verbose \
+                       --url="${HOMEPAGE}" --name="${MY_P}" \
+                       icu.py || die "Making the docs failed!"
+       fi
+}
+
+python_test() {
+       esetup.py test
+}
+
+python_install_all() {
+       distutils-r1_python_install_all
+       if use doc; then
+               dohtml -r ../*/html/*
+       fi
+}