bump, drop py2.6 pypy2_0, add pytest as testrunner, tidy

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

7 files changed, 32 insertions, 177 deletions

diff --git a/dev-python/icalendar/ChangeLog b/dev-python/icalendar/ChangeLog
index 09cc27e313ae..151064b449eb 100644
--- a/dev-python/icalendar/ChangeLog
+++ b/dev-python/icalendar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/icalendar
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/ChangeLog,v 1.36 2014/05/09 05:24:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/ChangeLog,v 1.37 2014/06/07 07:04:24 idella4 Exp $
+
+*icalendar-3.7 (07 Jun 2014)
+
+  07 Jun 2014; Ian Delaney <idella4@gentoo.org> +icalendar-3.7.ebuild,
+  -icalendar-3.1.ebuild, -icalendar-3.2-r1.ebuild, -icalendar-3.2.ebuild,
+  -icalendar-3.3.ebuild, -icalendar-3.4.ebuild:
+  bump, drop py2.6 pypy2_0, add pytest as testrunner, tidy
 
 *icalendar-3.6.2 (09 May 2014)
 
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index adb805b5d414..8c8d47c047df 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.1_p20100409/01_all_UIDGenerator-fix.patch 735 SHA256 da06c4912bb91c9c425ee5b6a225de81d40c52bba00680a67d4b4cd596518f5b SHA512 a35bb8e3dbe37bdc556ce75d01fa3fba7381351f4f643f1437acce0fdffcd9dda483dda190cddf9f16a9489a92e48505213ce6a6c706833f9002818a6f684a38 WHIRLPOOL 31e88124e0f78551e0887e292ea0401e5677a25e8be3b232ee4e9d37b486678f014e16939fb5cd4a012454cba27297bb2bf6b32e635ca065b983c75ed5d49f4c
 AUX 2.1_p20100409/02_all_vDatetime-tzinfo-fix.patch 1378 SHA256 184dc5255a1755c2265a1993b9458ecdaad5caebbd99c171dd4a4178547a3fdb SHA512 5cb3372d5b510895234dba183e30f64d9720d7895061ef4cc511d8d298a371f35409454bf5ca9b5457b9e57c7a4585d2ded339e3fd5a268e2bc0657b3359c6a4 WHIRLPOOL 276bd54d533e1acfd2b5b7160b9641f4511dc04104eddabf65e5dd4f55389696e0b8e0810f622d46328757d470c82307d727d976483e329d44731aa212a78d17
 AUX 2.1_p20100409/03_all_duration-fix.patch 1486 SHA256 9b670789872f6e7a504120b728eea5215e09510111de10b7f8f2a3b5c7599662 SHA512 80f55552a7552b2f0edef18d5362a69bb45102ef200934822c8e79ed94b27ab091019cb5a18017684474b8fad90028b72febf1d7ec7a4d08a97ee37340407796 WHIRLPOOL da8a638517d6e2e7cbc605a55b60dd8904fe39f2ddc7e6cf2362a60dd8a4f843ad20f23bd53ea037208e1cef2dacd450dbe6405f2cc0795262b5e4ffaffb8b04
@@ -6,21 +9,21 @@ AUX 2.1_p20100409/05_all_utf8-multi-octet-fix.patch 1013 SHA256 bbe200075696f881
 AUX 2.1_p20100409/06_all_test.py-use-set.patch 1372 SHA256 2ec2d2a8f9774de2c66b407f0fa88343fa49628441b0aaf3d404044ab3d2419c SHA512 b7794861c532f76d7b8cea63b549110c8c5325d8e4917be37fd069d4ca64e6ad39ed55c6d285ecf4eb7c63150569ac36886dd0e51a8a4dd79a6bcfa0f0d1a9c7 WHIRLPOOL b7e268e994e7f3e0a4f44f152e198ce6805f61398269bb4655a2b7a769168288d661c5e78b75169a2cfcfa261868bf987fde9838ca360de19ffc9d3bde40146e
 AUX 2.1_p20100409/07_all_vGeo.from_ical-test-fix.patch 630 SHA256 8696966c60aa86ee049b1c98ccc286d82ce0243a6d41c327a73a6868a4a52bbd SHA512 7a343290915445ba2fd10d017ff50eb3ce18df2c760cf2011a720df7a0e67eb30af5645bed42bb0930b120dd7581244ef345f779a5479f7a13fe939be8160e1b WHIRLPOOL 88320a2f598384280af22cd390a6ebbfece6234ae25900a140b2a23ecafc06fb4fa10749c8abd8641c8a60695c5eb4ced315a43ea819784466d142d71dfc42e5
 DIST icalendar-2.2.tar.gz 152855 SHA256 58974feeb8a6f8daf14fa8b093eb90a1aca4dff59d83ae96a7a8b8d9d66016a3 SHA512 61a6d18a7e9d3d6b825454752bb8d68f01e834db7989bb82467b49d43ab99184b2d3cbf52ce25fc7b6a16028f5b53b8ccf2798dfd168abf4ed305c6eed40ecd7 WHIRLPOOL a2ccd510ef77ac8375cb759682c9fb6378efca5783f17b4fbf163f0b0da7580af3cc41c67756ccdd18b84b19ff94b1989ff4817a45d7f639ccf6dc04b296569a
-DIST icalendar-3.1.tar.gz 50530 SHA256 35fc6b618b93f7e6dfc6e16ce2e2012fa540264b385761e6405cf3cd2972a3ad SHA512 f108cedc85d66b0b6fa0c72f6068748fb129a5929a72eb56096ba0066f9121da960f3f034f9218add335e5e0b08564379a2edb878d2ac09bdf40c6f3365fb74f WHIRLPOOL 4bc6ec93632a7eb52c1311da98822246cdf922fb8ea87623a1db13dc5eb2226c05aed35f5295d26ff9155cf8a37331fe077b5ac8e4d586e21a52d2ad27cb264b
-DIST icalendar-3.2.tar.gz 67177 SHA256 d6b212bb2fc1123fe6e47464d13e3b120e6523bcb9e27468b8744e2d9b5ab076 SHA512 c29d5e7c34753b04183651601679bdb232dc93bfaa887ba209ac26e09943bad822306adc6271efe4be25a0c926637b729b8204d09fa4274a347cb88a9344d81c WHIRLPOOL 15e76c300158d63c5b9a9fab36770f4fa6f3a2942f5737661982b58c5e6d6edc03d204d19a57c8506290def9181f6062a43a2ebe7d48f26e7e93f39d8e386bb1
-DIST icalendar-3.3.tar.gz 60268 SHA256 68ac21ff1ac30a4a66f05817fb4ac3bc2af3c15e3eae68d5d5164963a17ee5bd SHA512 0ccdbb3f06f65c694491512900f8b8421be8b2cea2ea4ca34348167ff3c9c6586658b35f8c16392d711da26a98ae2b5c5ee910b63ab79263feea70395e57d1c1 WHIRLPOOL 46861423770c66635a3388e05371351712f69bbf99dadd7ab0574c4772605d37a97170cc967328eb136c09ed1927a835f6129eae8e5f9353bc058196bdfdf64a
-DIST icalendar-3.4.tar.gz 61465 SHA256 43c2d272e2e6f74bb192c50d6ed18175ac1d8600a28e10f28cd9e5180a87ebdc SHA512 71e543b8b04c506ef172cfd0a022da5ec7fb4915a0c01ec3ca467c3276ad8094c63d0b8a45630c1686dbafa3c40c588454c1be5dd4cb2c5c9f131300ccd60937 WHIRLPOOL ce492368f217cef0d743adf52f4472fc544351f58a48c639c49570ca0a492e924c4ecd0f1adfe9f78704aefb1bbbace00e9dbca159f41dfe3f9ad8b23b906c5f
 DIST icalendar-3.5.tar.gz 59780 SHA256 2fc1094896b9dcdfc87b5c07ec4a4dd3b65b70c1650e91884eff96ccb9e89ea9 SHA512 e2b105f3dcfed5de2c63600dfc76eb328a27302a921e34b95026a7bec9b1322c5bb9a46b3a2fa0d0e8659a0f6e1ff4432e20665ae15c11b804194f87b088a115 WHIRLPOOL 0e9b107f5f3c8209633bfdc20ea88867999f109669328052f5cb464e0062bebb5b3f2d747c431cf4ca7d7d4550531cc9b6477bd87e7991eb4a1e7862220501e1
 DIST icalendar-3.6.1.tar.gz 62862 SHA256 ff7e6256515983fd2d10535a171fdaf8e0d5a1be814d6486e4f3c8438568b46c SHA512 16370fc25ecb23ea3cf4620170da17f8520a954d7c812abc37e38e65b7e657c1a019c0a8f00e3684b3ad367b9ae105215ffb830bf23ca276d7d9099a73ad9376 WHIRLPOOL cb5d76f3f7aa86392e08b12594815bf494a6d5183f3b59e556f837bf08ebc988cc3885c3a60227137949d43f68282784cfdc4bb6306a43631925fd958967d113
 DIST icalendar-3.6.2.zip 85863 SHA256 00f442e4df172707065ffbe2ee01628abe60225f17c277d10135046e9e4ddd1d SHA512 24e53ea01a57134b11908d2323a4bde9788e2fcd0f177dc1ab896a9466650317c86f1d0a231c33998780c26fa28779cd21e1c3e2d3522f6278ba521da1aaaec5 WHIRLPOOL 6fb0c123d5b488e545dcdd4e0d52c17b68bbe8c1279a4fdad74f5a9d8a5d343e4a6a5a0adc15ef5a85cc4fee45381ba6588eb7a6decc5c4ddee75bb55b5743ef
+DIST icalendar-3.7.tar.gz 63205 SHA256 0eb5e5625a6ac3d46cbbd87ca00828c5fb9412b66fdaa3f28eaebd28b40a82e5 SHA512 3afea2bf465a3025ba230ab904973b9c814306195b5636b2694b444808fbf0e28b47d2b6d328906b32beb4b313c897491fa7de23aa3f596936a2c067f506e848 WHIRLPOOL 9a68c32d65e9f0e9a134d44678f14f2d443b65c72607de7aac0429e358a2979fd9e50541ff90e4dbf785b16a0165ddd54387f5f9ea835dd242d1d512f8ee576b
 EBUILD icalendar-2.2.ebuild 962 SHA256 4105bfb30f9902e70326b988da261aa82ceea954e1f69d93cd0f6880b1f11b01 SHA512 9c71cfe20479ebf7f5854e645797eb3e9a2897dc6f81f73747b8c045928fab047848b3d21d99754b160774027c9c6aedd951ce06cbaa7c10b4736d04c49ce951 WHIRLPOOL a5c953cb3689a31bd718ee6d8b57f9e91e7853233a6a61e31bad64ad8468ea9ce96b42730540c9fda69529da54ed8013b71cf7f1bfc9e21660d1235aea481ea7
-EBUILD icalendar-3.1.ebuild 925 SHA256 d9a7fbdd1d69c723d31c058c4c5bbb4d0f288f5e642921cbfbb889746c8f995b SHA512 72ad19a7751d262813155504b3dec17118224782c987f897f9cc57eb9edf8c9e3c4c7baa5cda96c3bd9d45a671a35cd3a811bc227d5cae70bb784c7ae74ff93b WHIRLPOOL 2a54931fc8b2aba8c9c48f6f59700afc2dc5c94d5c90fd9436334e2d69f631b2fc6772df88363cdd4c52529ceeb16455850dae7b28062509a207ef6b6c6eeb18
-EBUILD icalendar-3.2-r1.ebuild 966 SHA256 1ba7f3ca48a1186178bd7674fd80d2bd43ae6f4442d1cec320170000a03b742c SHA512 cb0b38fee31e4ede75b8cae4ca2b2ea38ed05b9b29eaf47b815e8cf595a737b3e8bff095785c0680c6978a23302e7fc50ca3ccef52a89c5ca71ec933dd15c06b WHIRLPOOL 68b216c13cc127a140b6e39969e131d3fbf026bd74cbcaacc0e8fd33fc6972b24af64c8d5883dd9b1c3d7340f59ae8fa5f9021fccce11afb538a70f7789040fe
-EBUILD icalendar-3.2.ebuild 904 SHA256 3f3b030daf39147faef982c547d86638e2c728fcdf18f15b9b31f140e1952dea SHA512 e95a66de2557994ef84f5b49d03a9e2572ec16b4c71764e47a0871aa1079460bdafdfe7fbb62d24eb2b32ed6e6edbb3eec33c80d3a5ef25a85857833bd6aa892 WHIRLPOOL b229f65d151f0a5b557b9d74578205245399f195e567b0865106bf3582ad38db7807f67ba48c65b5cd6a62f81813f57520076f97986697417e94e8df4f0c5331
-EBUILD icalendar-3.3.ebuild 1009 SHA256 f12a9a716637ac1afe9b0116f4e7b193d6ee36795c7470987d3b4578313a52b3 SHA512 e48ae73a44fbb612a5ea895bd699fb798dca565e497b7a0c084059fb8aa4e5b3037fe8203b5189460bda540dcd41e20091ce91c7b98ff6dd910a6545911d53bd WHIRLPOOL a82af9ec8b81a9687526c609df4e0fd82a11348000c151f7dcdb16231dda518d85853a09954c3044003e5402887829737c7a87f7f9720b1a2b4e2b106f1ecfc7
-EBUILD icalendar-3.4.ebuild 1082 SHA256 c1d07356fbdcb96a24bed0fba500261c3daf6175066fe8403d58782476d14165 SHA512 1f3cc41c7adeec03f21cdf7ae345565c557953283f19d5c0bbb592cf54a947e6e65a7384ab2caca1755f8ba9dbaef6c8455e9c1b27d7a661ab318b4359609dd9 WHIRLPOOL f3a260424eb92d3b56f4e4e1fd45d9663c326827eaed5f30c7481ed937d84a5f7a3112ee074244f6b5fe127fe1acb2ddc1f99979bda842511e3ac6660d8369c9
 EBUILD icalendar-3.5.ebuild 1080 SHA256 1d85fcb57ffc2021c6ceea70055ec103cda137023a04a12dc0147d1e8623fb5b SHA512 0561e6fe40ed49a36ceb4287b980a53bad070ed1e6cc5e5a35e3bf3890416690ce188dddc15b5f5e228b6eb5871e113d1f2f4141afbdb31beb8474fc9ed1c8ad WHIRLPOOL 726b41c44af0f590b939ea0d6a627909eada376ec921996174777ddc6f178893a12fcdcb49be44f4925aec4f356ac86ad5c5c9576a4f18550f669f6eb40e53c7
 EBUILD icalendar-3.6.1.ebuild 1102 SHA256 8ad3ba46035fd66771ba1179301cee4dc91a3b54d90ad7ec8f9732fe7b33600c SHA512 f015c5e36b6e8ebb7eac35da6ce4d7729c5694762b16e45848f31b8a691e87b8ca972dc3732feede1d92299919ce52abbaea5e5119234986c77eb9a3d6cd12d0 WHIRLPOOL 88d7b5edada3619c2e0b11016680b4710aee343b0d7525ff0d262256601685b366ae5d491b5e866deb9d54b4d36807f031bb0acc7c487061fc4aa3100bea07b6
 EBUILD icalendar-3.6.2.ebuild 1099 SHA256 ffa885468000952ee033736575e96723eb5143b10a22d531c4d3711a47346b80 SHA512 c7d323fdb44a86e1f4f5cbc9a2f018d82bccf3586f5b922cd4a3262da9920b537396f60fccf322b05a879a4fc76bc34a6600ce8d99d21d6ee116486c921563d2 WHIRLPOOL 86fa0b7731db6673a576ed1b09f6c3a0be19f8b9a6a6ff4f4fc9dbcee3bc25bb4489bf961cc6ca35852538743bb0b7f13ff2818addbefb616e51166332b9d540
-MISC ChangeLog 5935 SHA256 34ecf2257c09a7b2adc68388745499f8457bc2da72ba3d53e7d00bb38b075116 SHA512 e3e7ad802fddf40a13f2145a86d22a35dab4dc015c1ae931b51b4b26654bd09bf44af05883e2f84bb2fa9d0b5822cdb110791f298cc55f00d8d19e47c116fc6f WHIRLPOOL 0a119a0b41f421c8b225e4690858fe441869c24ad892a6e5e12e9f8dca17404de0c7dd2068e5fde00ac53fbc2fed69487fba82afc64af0c6beb5ca4a7b83c2ae
+EBUILD icalendar-3.7.ebuild 1236 SHA256 ff34c256793a155179724d7f2c24521e61a9be5d9aec6c52199534910483b084 SHA512 e95978923ee1942962517c20007aa9cf51ec198a5693d120c9b70eff36b00d1ac07da9db06f67333471b2111e29085bcac59fc78680740b8b9fa78ddc54af822 WHIRLPOOL acf372afdc1fda851d6f3b45f7df2cf990d1c69136855aa5be3a5e20d38d058b2d5cfaf07629e8722f442941dde1f765a55990e451c1d3bc338908edd448bbe3
+MISC ChangeLog 6218 SHA256 d4d556b92ca00ed618d277b693346e0fd7942dcf08a8266962e0c1a1a1c8d2c6 SHA512 ff37ec02599ebe9bd0ab6e3903c95ef06ba5e68b4750f4546d1c0b6f549816286109d7f9a617e4e2d775cd8d11d8ffe862a5322aa1eb596320fa90087abcfdcf WHIRLPOOL 33712b465fa853c3f86e21e491d18a42b7fe602801f80a3ec3517ba39249b91c7939d18f1eb99bcec3ad0dc31d2022a3c60764a21e5276f0d343ac75c2e3d29e
 MISC metadata.xml 321 SHA256 0ba2111890eba6d641b11c1c317efb09976174095c9d45099e0a5c8f37e8866e SHA512 a4c0046d1aec788e94c6d1dce9736c87891e51a3632dfdbda9928ad4aa226f019fd6ba2c6629f2cf10a12644f8a7f709d91a2c7474985354ff98ce6a708a7800 WHIRLPOOL f0816a2297bb8ac48376ac410d1badf57c1cdc2f1bde65eddabea0f5e7603046d3fad81fede26b3156aaf452c51ddb363629ae38e41556f7cd75bc170342bfb7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlOSt6UACgkQso7CE7gHKw1uvgCgn0P+6SkAnfp5CJeT/x1gwCEC
+DJEAni4MnXW+gaTzrty0APhBB015PnCa
+=Vw0W
+-----END PGP SIGNATURE-----
diff --git a/dev-python/icalendar/icalendar-3.1.ebuild b/dev-python/icalendar/icalendar-3.1.ebuild
deleted file mode 100644
index 3a3d99a2423d..000000000000
--- a/dev-python/icalendar/icalendar-3.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.1.ebuild,v 1.1 2012/10/30 06:19:36 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2"
-
-inherit distutils
-
-MY_PN="collective-${PN}"
-S="${WORKDIR}/${MY_PN}-8538879"
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)."
-HOMEPAGE="http://github.com/collective/icalendar"
-SRC_URI="http://github.com/collective/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="doc"
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-DOCS="TODO.txt"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd docs
-		emake text || die "building documentation"
-		DOCS="${DOCS} docs/_build/text/*.txt"
-	fi
-}
diff --git a/dev-python/icalendar/icalendar-3.2-r1.ebuild b/dev-python/icalendar/icalendar-3.2-r1.ebuild
deleted file mode 100644
index 01f3f35d3c23..000000000000
--- a/dev-python/icalendar/icalendar-3.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.2-r1.ebuild,v 1.2 2013/02/02 01:16:33 mr_bones_ Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-MY_PN="collective-${PN}"
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)."
-HOMEPAGE="http://github.com/collective/icalendar"
-SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="doc test"
-DOCS="README.rst"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx
-	dev-python/pytz )
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5 )"
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null
-		emake text
-		popd > /dev/null
-		DOCS=( ${DOCS} docs/_build/text/*.txt )
-	fi
-}
-
-python_test() {
-	nosetests -v src/icalendar/tests
-}
diff --git a/dev-python/icalendar/icalendar-3.2.ebuild b/dev-python/icalendar/icalendar-3.2.ebuild
deleted file mode 100644
index abd333946131..000000000000
--- a/dev-python/icalendar/icalendar-3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.2.ebuild,v 1.1 2013/01/21 09:28:32 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2"
-
-inherit distutils
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)."
-HOMEPAGE="http://github.com/collective/icalendar"
-#SRC_URI="http://github.com/collective/${PN}/tarball/${PV} -> ${P}.tar.gz"
-SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="doc"
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-DOCS=""
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd docs
-		emake text || die "building documentation"
-		DOCS="${DOCS} docs/_build/text/*.txt"
-	fi
-}
diff --git a/dev-python/icalendar/icalendar-3.3.ebuild b/dev-python/icalendar/icalendar-3.3.ebuild
deleted file mode 100644
index e16dab48758a..000000000000
--- a/dev-python/icalendar/icalendar-3.3.ebuild
+++ /dev/null
@@ -1,41 +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/icalendar/icalendar-3.3.ebuild,v 1.4 2014/03/31 21:14:15 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_PN="collective-${PN}"
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)."
-HOMEPAGE="http://github.com/collective/icalendar"
-SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="doc test"
-DOCS="README.rst"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx
-	dev-python/pytz )
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null
-		emake text
-		popd > /dev/null
-		DOCS=( ${DOCS} docs/_build/text/*.txt )
-	fi
-}
-
-python_test() {
-	nosetests -v src/icalendar/tests
-}
diff --git a/dev-python/icalendar/icalendar-3.4.ebuild b/dev-python/icalendar/icalendar-3.7.ebuild
index a3fa90ce1e47..8fa60225842e 100644
--- a/dev-python/icalendar/icalendar-3.4.ebuild
+++ b/dev-python/icalendar/icalendar-3.7.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/icalendar/icalendar-3.4.ebuild,v 1.5 2014/03/31 21:14:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.7.ebuild,v 1.1 2014/06/07 07:04:24 idella4 Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
@@ -20,11 +20,14 @@ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="doc test"
 DOCS="README.rst"
 
-RDEPEND=">=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
+	test? ( ${RDEPEND}
+		virtual/python-unittest2[${PYTHON_USEDEP}]
+		dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
 
 python_compile_all() {
 	if use doc; then
@@ -36,5 +39,7 @@ python_compile_all() {
 }
 
 python_test() {
-	nosetests -v src/icalendar/tests || die "Tests failed under ${EPYTHON}"
+	# From tox.ini
+	coverage run --source=src/icalendar --omit=*/tests/* --module pytest src/icalendar \
+		|| die "test failed under ${EPYTHON}"
 }