summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/pycountry/ChangeLog9
-rw-r--r--dev-python/pycountry/Manifest28
-rw-r--r--dev-python/pycountry/pycountry-1.10.ebuild (renamed from dev-python/pycountry/pycountry-1.3.ebuild)14
-rw-r--r--dev-python/pycountry/pycountry-1.4.ebuild30
-rw-r--r--dev-python/pycountry/pycountry-1.5.ebuild29
-rw-r--r--dev-python/pycountry/pycountry-1.6.ebuild30
6 files changed, 22 insertions, 118 deletions
diff --git a/dev-python/pycountry/ChangeLog b/dev-python/pycountry/ChangeLog
index 41fad5d46dbf..5fb49635c648 100644
--- a/dev-python/pycountry/ChangeLog
+++ b/dev-python/pycountry/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-python/pycountry
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/ChangeLog,v 1.31 2014/10/04 14:16:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/ChangeLog,v 1.32 2014/12/15 08:56:28 idella4 Exp $
+
+*pycountry-1.10 (15 Dec 2014)
+
+ 15 Dec 2014; Ian Delaney <idella4@gentoo.org> +pycountry-1.10.ebuild,
+ -pycountry-1.3.ebuild, -pycountry-1.4.ebuild, -pycountry-1.5.ebuild,
+ -pycountry-1.6.ebuild, pycountry-1.8.ebuild:
+ bump; add pypy3, remove old
04 Oct 2014; Anthony G. Basile <blueness@gentoo.org> pycountry-1.3.ebuild,
pycountry-1.4.ebuild, pycountry-1.5.ebuild, pycountry-1.6.ebuild,
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index e2f739564b44..c1e1308ad1cf 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,32 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST pycountry-1.3.zip 7895245 SHA256 96392022f6bd036f3c5143af36ecfc62d62c99ded039378da18f89f9b2f383dc SHA512 6dfdcc5b2436e9a28ae6f1622afa6900f5d4a63a6791cef404a0be1f365b5c43771a31271caeda61d02a6ce3f4ed656f0cd3984254a32b7810c5c556b66d200f WHIRLPOOL 3d35d1b769348110abc7501ec018761feec4e601421e49b8f4ee89cfe385730b34413f6a258943d1a3203d7250867ebeda707bc75e10556dd6ec23d1008b1319
-DIST pycountry-1.4.zip 7911812 SHA256 c8e8dd244ad32bc1dbb55565b83f9277d0e0ad423c190844acd7e4b9831c3652 SHA512 59e6741f8c4a92412391ea672f6dc3778d87fcc38a5f37615bb60c8d022990425cdd8c04724c8eac1d503f11fea68a21989cd24fed060fe3efbdbeb7ef9177be WHIRLPOOL 36dc5829cb78014a67eae1db11cd1c4880ad108346acc75f9507fb5cf6cfd6e30423229c917081e9d76af6581396d7afce13a7585e7f16991a072646229f71ca
-DIST pycountry-1.5.tar.gz 7384714 SHA256 11c014150120d51ebbb2a116698ad608c9e24e4f36c1aa64e94c1d5e0cbb799a SHA512 525b3ae2bef40bdf4c88978fffa0d95fec22a6e03dea259c84a980b36406a14667cad4bc1613b736a512835e9823fa2fdf73d80913d4dffbd2c53caa42f372ba WHIRLPOOL 8609147ec714175b5998e17737ef1e6deb92b221f0a207e8568bf34f8cb4b31ef9a597017a64159cc21333611bd303929776ef1bd74a9558e53b71053741ae8d
-DIST pycountry-1.6.zip 8014680 SHA256 160d49120bca85282f1ab841181d83d38f68331d113cef12d66708ff6b786262 SHA512 c5e4d773925d4b9ad1c0ef4c403907be0ffa526bb3d77ef568639c60ab2c9ab82d78e75dbbe3e52c063562df6b0f63569599de3b32311b8eb937b838d816e90b WHIRLPOOL c65e712ff86fac077560ba18d61fe869be99b8aeb01502bbad8bd84bb36c7aa1280b4f782c65081d4d46a7730efb09e5760d03c77107be20020088dc288870ce
+DIST pycountry-1.10.zip 8140587 SHA256 29bd07e5f0d0471c260cea14e2ca4b7d705228ebb024b4de139dc87795576e67 SHA512 076de329c5b9d7626fbf0aace654504a2cd2d1d7bdf2ec89ba4763b38b756a6e75c7f3032c4b8785693d291ace7a206673cac1a457c4dd59e8c3ce1cd70d7d60 WHIRLPOOL 6c282d419da375e00171345477a5867b1e61a345d56c8f4739ff34fabebf98a78a2d4880b3b2ef616e00468124e1accd2efdbfac2c98bdf4c2db57d1d3e28fc5
DIST pycountry-1.8.zip 8138837 SHA256 ee2dbc157f21fc570e7a833180f8ae38ffbdee85af2c537b72d207af45dac5e1 SHA512 4f9fa21cbe58f5d6153eb112282a959a6638629e32ad686e0eb020174abc879b41857abf2704da19d5687e0335b30e1f153db1c95f53db32957293b2a795a80e WHIRLPOOL c44af37e0e62c5daac6e4b6232fb8dddd49b6dc6420e3bc05c4d864c56dabcd3d4f19367c66a0b4f0044a5d566f3156e2d9d6030e58ad7ee6e5a9010156776de
-EBUILD pycountry-1.3.ebuild 961 SHA256 1e286782cc594ca00f7e102466d9aa4046b39247ac4fb98e8e64dac2a21d4644 SHA512 491107b915888798de8b75de15476fcd156398fa5bc221d6da1eeda482c58f8ff7e1c44885cb214a826950e60b637eb46c0cb3c42603248f0da05dd9a0c737cf WHIRLPOOL f9379663f142afed3eeac7aa0cacf2c6ded7b37b4376c2ed4b9029142f87899b8bc925d75409ee2e8bbe9f1e001609bf9721925c6bdd5091ea0334009797c02d
-EBUILD pycountry-1.4.ebuild 960 SHA256 0847f9e1250db7dc33ee643ce14819d98bab8db11db29a004521c9153cae0cfa SHA512 c1405cfb8526ee6972cd199b31e28ea6661e14cf07601563f05f2814823ef11bef8ae5347768341208657234e1217806086fb4412b3d7c4cd5acd0f2e29d7c0c WHIRLPOOL effd5176570cce088457b92d95fbcc6e5a442010f8e8bfef67c381b78b6675f1b344efb14a6ea487e95181ee63c972765defc360f41cfe3d8e0648e169f5ac55
-EBUILD pycountry-1.5.ebuild 951 SHA256 21eeff5c83ee8be79c1cc31db9538a0da579f06e99815e74650ecba6e7abe7b5 SHA512 70894610ab333d41a4faadc6c3e9e010159a9785eaef8a3b21dd871a409504c2b33c756464b2dc563a6a7d550c2d14853d4dd95f96f2bd3e7a5257cdecb960eb WHIRLPOOL 9c2e207a1f0dc9b32c50e511899e90e7bb95392bb54c6f9b04350058e51232e36f3de3d4534870b77a270090b599e9f67f0015a657e12e85154e595de06478c3
-EBUILD pycountry-1.6.ebuild 964 SHA256 a647cea3a44902cd473266df0356d735c9d2214a480b5cc5dfb8b07b00efb261 SHA512 bf79260bb529d08660b339b1265900efaa52d6984f6f21a7196653aabb027aa290791a7f521b08ad60cfd4d09eab7ed98b331de23ec4290aae4b20496f23d72f WHIRLPOOL 8487d942d75a9c2c0d7768126d0e64cf68ebab906f0786d90b34d258c7179c525cbc2a308c378953a8b1003c800f5fb8d2aca2af9499b552beca1c4d488bec20
+EBUILD pycountry-1.10.ebuild 1044 SHA256 726b16261f312c60ff8b71586f843885358440bf80a61bf3e9262b189b26326b SHA512 75cd6837a88f7e7f40f245914308e2e3929d7a4d9b9b1b8b9ff371ba5c46b6d67e1b94c9b7a97f28225b2b6185cc4768e1be258ae3f06549e59a37899d875cb1 WHIRLPOOL 3d702e0e1fe3ab55ac3ca5ff2910d165c87cbc424dc3eef932e03bb54bbcc680afd2921299543dc479242d3810014add4587a48753af7506a0ddf54dc0fbf3e6
EBUILD pycountry-1.8.ebuild 1138 SHA256 53298705cdb74b2d294b16994e00c23eb563c570d9918111f23538546e6fa75d SHA512 2cce6e88f53ef5fc70a6be56d57188e2204b2d525aacddc437d6ed9c0b9685a4fe2e6777306546cefd25e80380d58072f9bbff5dc0f52c5aded825ccd7fb8794 WHIRLPOOL a0870272fa73ab62643514d83f68428d63bf1f1e652751e75cda0b9e3952d735f552394f450471969f6e182f5546bcc3566ce5c2bd1a902ccc7a2486d869b9ce
-MISC ChangeLog 4900 SHA256 75bb6c94b0fdef036eca1c829a7019ddca79c44ca229e9112737795fae4a7834 SHA512 a49aa8b6feef5c1f96c06d6ef90dea42597aebd294fc358e6c696ca430f23961d19c979559740df7fa2ae262fc5cdd822d191f0b634466c803ab817eec319712 WHIRLPOOL a39f6200f95ded661190f2d738d24e1848393dbe339d48a1419252450fce18c11e81e0ed434be279dc210a3a11d71f8eb4440bab892cd9f5b7e753ca62b434b4
+MISC ChangeLog 5151 SHA256 6488a9684537ce316d7868c4e974ee1cc049dfc19ba3da6d0cff4139acedd38c SHA512 95fac70d9499ef413b518a683d48b826fbca3e779b366e1f336a392bb1958420bb495812676afa98d944ef764234890914e1bcd373913c7e91da68771058dc8b WHIRLPOOL 43e4ed26c657da4139578ec7b92ce9f333f60267571c752f966bc08bdae337a46bc8952ddf44a83443875d38168548f21c8a5c8546352982c1f72e1b94c8db45
MISC metadata.xml 371 SHA256 9090db2e29cf8ab5b40e900d5e585657dafe3bcdb120189ccc6467e95c043e0b SHA512 3ab5bd86f54fcc229d9194704b2f84e756aaf641224ffd0ffd6b1b2cbd89c3c1bcb511ce111786bf6a03aebcc97554eccdda6e710e7814b3abab7c5e6860b5bc WHIRLPOOL 8d8f1b625a2aa6b762e89268110d59eee687a52939f4e878ef30619723bc28dd982f8439c2a49fd0900e7358432d8f12361927e699884f0c4b9e201f7ee063f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUMAGCAAoJEJOE+m71LUu6yjUP/3GKgDFBVVwimDgi4eiCEZAL
-ky5G10I1ZIRYvXTptUiv8L4HuBSaX5XSBlA24zEwvfZCAIs/ET+cmFkejScjlwmq
-YCNVgRTj7MciRiSBLJbsmUjlQPMBx6bSqDQMD7QIR90rj44eKakkpa/+HxwhsNW/
-2qgS4jKigGv2Z/B0mJC1lDrDp+bTptGPdM2aYUnYjd2BShE37nmmLCEoK9G1vX9I
-clom80F9YOyOUi06TLHh4PAkOopzVb9PNeNELAqTh6SAxof3jlTwz85pO8D53s6P
-HrfzCnk9qCUT7NzIX5eU9XxC1wkMvZ7T7XleBnkv6ks5UMK6TQdu/Tf8FpysJicm
-vy/guwJ0ONtUcx64eK4le/UJ/pP6nLi9cBVoIXPhwky9BkLOSjfyw8xtpMMksH2X
-4GTJp7NOG92r2BkZTkArYKRbpixoDm/HTFBZ0FpGp70MpM/tQGKau6ZfFYRiHvbp
-kuE0osmv3xHhBdCgcmHd1IB3LqJ4yzNeiI3/KZZnMSCXn2xN/PmuRhJDl6euDumv
-Os0ME6UxaMunpQn40ZSAfYq9TrUdL406SzAAgUhvjHbTquYFOGlDhXXaggAibqmc
-i38CC26xrcLj9DTuup5T5xyWFiDZmeQ2iFPPwmXU8eQ4w/7djubDRdRa5RWfMBlF
-8e5SBW51Kgje3G41OFw3
-=Q9bW
+iEYEAREIAAYFAlSOoksACgkQso7CE7gHKw0INACgw5J2rM/tQkS28T2dg+FF7tsd
+U3oAn2Q532c6HOOIQkTB/dv1BeqS7iVa
+=BG0E
-----END PGP SIGNATURE-----
diff --git a/dev-python/pycountry/pycountry-1.3.ebuild b/dev-python/pycountry/pycountry-1.10.ebuild
index 61ac094b1f29..04dafcd8d4ea 100644
--- a/dev-python/pycountry/pycountry-1.3.ebuild
+++ b/dev-python/pycountry/pycountry-1.10.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-1.3.ebuild,v 1.3 2014/10/04 14:16:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-1.10.ebuild,v 1.1 2014/12/15 08:56:28 idella4 Exp $
EAPI=5
-# pypy pennding actioning of bug filed upstream
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
inherit distutils-r1
@@ -21,10 +21,12 @@ DEPEND="app-arch/unzip
dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-DOCS=( HISTORY.txt README TODO.txt )
-
python_test() {
# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
pushd "${BUILD_DIR}"/lib > /dev/null
- py.test ${PN}/tests/test_general.py || die
+ if [[ "${EPYTHON}" == pypy || "${EPYTHON}" == pypy3 ]]; then
+ sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
+ fi
+ py.test ${PN}/tests/test_general.py || die
+ popd > /dev/null
}
diff --git a/dev-python/pycountry/pycountry-1.4.ebuild b/dev-python/pycountry/pycountry-1.4.ebuild
deleted file mode 100644
index 1d7ddfc3e4c7..000000000000
--- a/dev-python/pycountry/pycountry-1.4.ebuild
+++ /dev/null
@@ -1,30 +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/pycountry/pycountry-1.4.ebuild,v 1.3 2014/10/04 14:16:57 blueness Exp $
-
-EAPI=5
-# pypy pending actioning of bug filed upstream
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="ISO country, subdivision, language, currency and script definitions and their translations"
-HOMEPAGE="http://pypi.python.org/pypi/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~ppc ~x86"
-IUSE="test"
-
-DEPEND="app-arch/unzip
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( HISTORY.txt README TODO.txt )
-
-python_test() {
- # https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
- pushd "${BUILD_DIR}"/lib > /dev/null
- py.test ${PN}/tests/test_general.py || die
-}
diff --git a/dev-python/pycountry/pycountry-1.5.ebuild b/dev-python/pycountry/pycountry-1.5.ebuild
deleted file mode 100644
index 74936be4d866..000000000000
--- a/dev-python/pycountry/pycountry-1.5.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/pycountry/pycountry-1.5.ebuild,v 1.3 2014/10/04 14:16:57 blueness Exp $
-
-EAPI=5
-# pypy pending actioning of bug filed upstream
-PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="ISO country, subdivision, language, currency and script definitions and their translations"
-HOMEPAGE="http://pypi.python.org/pypi/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~ppc ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( HISTORY.txt README TODO.txt )
-
-python_test() {
- # https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
- pushd "${BUILD_DIR}"/lib > /dev/null
- py.test ${PN}/tests/test_general.py || die
-}
diff --git a/dev-python/pycountry/pycountry-1.6.ebuild b/dev-python/pycountry/pycountry-1.6.ebuild
deleted file mode 100644
index b700c4e251b1..000000000000
--- a/dev-python/pycountry/pycountry-1.6.ebuild
+++ /dev/null
@@ -1,30 +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/pycountry/pycountry-1.6.ebuild,v 1.3 2014/10/04 14:16:57 blueness Exp $
-
-EAPI=5
-# pypy pending actioning of bug filed upstream
-PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="ISO country, subdivision, language, currency and script definitions and their translations"
-HOMEPAGE="http://pypi.python.org/pypi/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~ppc ~x86"
-IUSE="test"
-
-DEPEND="app-arch/unzip
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( HISTORY.txt README TODO.txt )
-
-python_test() {
- # https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
- pushd "${BUILD_DIR}"/lib > /dev/null
- py.test ${PN}/tests/test_general.py || die
-}