rm old versions, disused patch from FILESDIR and var from -3.3.0

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

diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 0c8f26c88a995ae57803a963d920d47bd4e78a30..68062ec9d53bd75f2731d837ba679bc3b03f4efe 100644 (file)
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.69 2014/12/07 12:01:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.70 2014/12/20 03:54:09 idella4 Exp $
+
+  20 Dec 2014; Ian Delaney <idella4@gentoo.org> -cherrypy-2.3.0.ebuild,
+  -cherrypy-3.2.0.ebuild, -cherrypy-3.2.1.ebuild, -cherrypy-3.2.2-r1.ebuild,
+  -cherrypy-3.2.2.ebuild, -cherrypy-3.2.5.ebuild,
+  -files/cherrypy-3.2.5-issue1234.patch, cherrypy-3.3.0.ebuild:
+  rm old versions, disused patch from FILESDIR and var from -3.3.0
 
   07 Dec 2014; Agostino Sarubbo <ago@gentoo.org> cherrypy-3.3.0.ebuild:
   Stable for ppc, wrt bug #530412

diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 3bf2266062f737f9c32f438c309b382d755989b2..e8be22b596a5aefc82a7898819d72922a50edfbc 100644 (file)
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,39 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cherrypy-3.2.5-issue1234.patch 394 SHA256 4869b0228c93f926b980129927476701f2332dfad6241c47309d5ee73cf6f6e6 SHA512 57992292b66d019dbbfcaaa5bc025fed2fbb2c5e3e4af44404165f68ad01f0679ac4710527cf397d67ae6f93b55beca53d68de511599ba668d1741e3a11c9dc2 WHIRLPOOL 5601d8a0a4db9fde661088c64a2a1cd89f98e630ae92d0fa6ecac53aeebc121162ee46d70af7ba9a4e8683fad4d710697ff06e7cab7913060197a55ea63a4b59
 AUX cherrypy-3.3.0-test_config.patch 701 SHA256 0022af457c0628097286f0a251895e691648310332bc38789b18736fa081bf7b SHA512 91eed9e00c8962a00dbfc2e57bbce12676c3cd6f2994bbb79bdd1c15cd1c5645124c11bc7ac94df71c0fcf58d998d2de7346a2ac44850e45c7740c55a9bc9d6c WHIRLPOOL f224486aa54ca8e3f544aad21aa9ad8e13ba524926494b125b22d57b23903a4a403c761eae44f48b8b9751ab0850bf1c86d333611b6ef55b21c933cb6385c44f
-DIST CherryPy-2.3.0.tar.gz 241999 SHA256 a41e1b31ab723f50223b303991bb4e1a420a05deb2f4ab923a2ceadece4854cf SHA512 71359ff92354abc7c2156d0f66e361c16b145180e04bb14c9bb2ebae474de6a3c8a3b266363dd6df370c21b559112cbe122fcdf08d68f03f755000bb8ca4eca8 WHIRLPOOL a74b3fff30c776fb51f0dcec97e7f4e676a60a2791901ebf037abaf0e3cc59598b985e467dbabf712af013da8ca77c1925e6b53d65e523f7d535e8ecdcd6213a
 DIST CherryPy-3.1.2.tar.gz 319196 SHA256 0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6 SHA512 968b1c7caa64a47d4e998083ca829fdb700b904eb243e0785e1cf490e034f4e883bbfe29680430ecc9c8000beec2c46b3fe24061e8d5e22aab666b5fe86e3ca6 WHIRLPOOL ef6349d26da654c11e0097be5f71cff79cfa21b81ed1f1e15d9c3f5dcc983d8a605a21a9cf6e34ab49160a1cb1b31ac6c2fff967be06a78c501289f80dd0977c
-DIST CherryPy-3.2.0.tar.gz 921937 SHA256 0a70d163ee33b892df064ab70d097d0fc125c74fc0c6da418b2964bb1d6d18fe SHA512 3cdf8b65b819d1c3af08c68e12e8c972ba1c313432cb0c822993cb7f14dd8544a73e778a3fcc956667da1c51d224b4561f354a03eeba371d54cdea5369f5a27d WHIRLPOOL bb4c9858e45e0d44fc56446c1820dca0c0bf87b8ce133f6d158fe48b74afd3fb594ee8bd98dfca36cc6719efb6e896cf9f616433459acb379a12d0e32e0eb146
-DIST CherryPy-3.2.1.tar.gz 568070 SHA256 e1d1f51dd51ebf11efb157c36a4b8df4f5d5cb62af073b3ca50a9284ce83128d SHA512 8c8e5672bebfdcada7ffed17f2f160154db00d2c42b78b53277292c443495dfd2f8c07d2cbb1496c5cd39219b338e93e9efc8989ebcf04fcedc8f40beab97a8a WHIRLPOOL 22daf41e03854edbd53ceb711d002d0cb67f2c3df5319f347dc16d01d57058a7fe6b77abb3184fe77fbbb00777ab9947dc08d5dd06e585b71dc20b441833c6de
-DIST CherryPy-3.2.2.tar.gz 414099 SHA256 dc5a88562795c2ee462dac5b37aba1cf4f34f3e27281ec11049227039308b691 SHA512 89cebf63d48df5bec880bcbc13b3e2ae6da76f59c06803177cc8d6905e2d4444de7bb9a63189e3d6a3fd82e2a2464f419cfa74c60b2765e9ef89866847d55b7e WHIRLPOOL b9407b60d6138e00f1ead9367f973a34fd591ab858a836251a70c8df693f2d62cb06d4497b19e147fbd963bccf3ba9cafbf57dbacceb8241653d55400bfd2a7a
-DIST CherryPy-3.2.5.tar.gz 423774 SHA256 1a0ce16d06d9d3b587af6122b7b19c9a9ce521d51640d21a155626c9c76aa7e7 SHA512 562a8dbacf35dc64ba015ab01cdf076eb6c58a21df67fc9cb3936ff37f3d6dad6271595ba431920533f3cc6c6c10896d9a36e818fada70d87ae041d7f00d97d8 WHIRLPOOL 65aa21bbe77c720f999bc07d57dfe191a9eb96f8740c941b4bc0e3279fb863e2685bf8b0a388a7bf745993964c16117ed367eff371dc0e3dc4dee3bf13fc95cd
 DIST CherryPy-3.3.0.tar.gz 429204 SHA256 f8829bf1b4f613833b690b33b2fd00b1da4ef98df3c70240f78ee91b70f4a5a2 SHA512 605d1ca5694cd8c5237f2115ef2ca39d7290b90c82b91c3699cfb59ad346c3506a1b78ad0502f89de43f8711d01afbbc2eb82f00f86ffbc0fcd63c1def88f0a4 WHIRLPOOL 406c735ae3b5f52408bab6fdde32684caeeb2092b4b0124b12cd43923beb1b11e899069ed48d395839bbb55e202e748ad2cb4e0c626ed29a0d2ff0bfef8aae5b
-EBUILD cherrypy-2.3.0.ebuild 1326 SHA256 0dcc334799ffd8cd418c115c08b1351cc3e76f8a4e258cbc1fdb3b644e1f72d4 SHA512 9051ec7033de98ca5959897c301a6ef5ef1c256c0b922cf67284d3a46a2619f3782fff17194d188ec8376521489a36036d77028068b4df577278a2a6e9471d71 WHIRLPOOL 1bcba56b898d4d50eecaa52fbdbc4af4197eb438516c5ae9be10af05a9e513b08476ed1932ac440d4045466fe15c283e88e82fda8923c83ccd62b9e7a8bf47ee
 EBUILD cherrypy-3.1.2.ebuild 1106 SHA256 71021a809633d279034d3235c29e5f0c98e6f7de698fcd879f836abfc443e799 SHA512 5441790175dbc88c45ba07a9d66a57d234c2bb53cad952151a9ea6ec606f4fd8eeb0f26070d49915b47dc6f951fda95605c063f9dc27867c5123201ad8a96cd3 WHIRLPOOL 60d33302217bd09794dd1819d033bd14cd1be0f38f0b1698210805e9dec25f1991f79ccc73cbb690c5b83ae27a09bc72d2c38cc6b7191c8cd1b9c30d070b2730
-EBUILD cherrypy-3.2.0.ebuild 1504 SHA256 b79ffc0ddf8b6d7f47bf615db1fee128241ccc4100d5c792674a7619072cadf5 SHA512 6180d4b5b79096829949399f6e9a56fa4b4135da29f079dd9335622f68de2beb7f9d41c1a2be8cdd123efc4a542fecd11e57b490b9122038e17f690d0023e6dd WHIRLPOOL e06a1961bcc86aef53c43f2f1c621f36c9793613e9b8a4b6356411f3e8a6205e9505d7d5d86eb26bedc04f6d2e4305a8cd08da976e575d43ef7cba48f0908836
-EBUILD cherrypy-3.2.1.ebuild 1275 SHA256 e1571688f70795fbeb1180953523fd149f0334d528c6849dbbb93e6956d23247 SHA512 3d50ac9fd26c19ab75c4121f05dd844c9c52aa5b549aadebec12d1b87dadd723674b70b60b77ab5e2583b2f911011bb69c5cf990dc76ccce5301b238a96f5e01 WHIRLPOOL c8b4449b912e6df19bf104264e4d99b8c415a5a5302657d97d87b9206374ce68db9cefb8f02f4422528316370930863a3fe25bc61a58c11eb5aad30fba973075
-EBUILD cherrypy-3.2.2-r1.ebuild 1605 SHA256 c1ac12f4fc778ebd720b713cabacf37053c3c847df441aaea66a64a01e378e33 SHA512 15793c963118e71c3c15771c54f8b8b7ea23d723e42a4d787af570ce5bb3e499e0d58d2df99f462b4d87da51c21be4db9e23375e17728bf45a6a43a5001a90ca WHIRLPOOL 3fe040d7d7aae6305052791253667d2bfc49ad3f33bf208688e868b94dcb63bda93421a20a8942a7a7f5f4a5c0a22483255d87472a2b90ab8af3d1a15e25dab5
-EBUILD cherrypy-3.2.2.ebuild 1233 SHA256 f6552d3bd15783bcd4c69633702295271191ae840282511fd9e3140836ebf72b SHA512 91d76de71c9032a88df0b5a90e4f4a69b9438923326e8bc252f5368267de02dca89cc3da121951a15837c2393debb6cc5aab1dbdb51f347b6f03f9bc11d7577f WHIRLPOOL ab078a8354bf20788191ee340e3f5638d690bd6077d89a57b031383d0482f9ce980d8b61e4e596384a435f275aba6eaa456ed2af87909131f3a5c51f0fc90cf6
-EBUILD cherrypy-3.2.5.ebuild 1412 SHA256 825d9e2a5db765050b1eb19ea78d036ab53c8f78698da6ebc0a45b5fb87913b6 SHA512 ca391abdf2acdd5cafc59653f1b32d278d248f81752e5fa86a961301ee341086e6c55c42fe1b7a22bc90fea313a99192c75a9ebf7f82285dae6fe4aa7aa50e82 WHIRLPOOL 701fcc6b2f0b844b5dc9adb465e97f57700f585898482a7f9c5dd8261eefa27d872341b9d4ffd48670821a52e2b17ad29ec2638f7fb0e193504751e95c55f2f7
-EBUILD cherrypy-3.3.0.ebuild 1860 SHA256 5c559a946c486449c5a67badfd38b8c66c7c156d7790905e609e272bbefc0937 SHA512 adb2a42db359e606b5847dd20bf5464f14b0d87e4115cc44a780f82548e0f943fe93bd9f0491f6537148330808f6a0f7e6f0027b7c1798faecbd9b87daef4408 WHIRLPOOL ab56661daf0899da2df21cf174b98c37734a44639880b5efc6ba633f6a83f5ae6e53be592f3692f6281f841dacd86eb0d87474fe5d8401eb33be23370c04438c
-MISC ChangeLog 10424 SHA256 01b5b93c1a3422d995db57578fbead5b81d9385664d1227cefc62929264b515d SHA512 74947195748a9ef09b6d68f6a4915db7e225ca02629dd842a238f7fabef40598f9ff247b98038e2c8aaf74b0767adcb58998640d9e52f39c35886c82e30fe792 WHIRLPOOL f6c26b9f69261157699ec37ac3d340c52e6fdcfca3aa502a393afa9eb6691ddfecef8f2559df2268b854436ac0066092f1d6753fbfdbc1a7e19b7cfa242df129
+EBUILD cherrypy-3.3.0.ebuild 1795 SHA256 57964a6c3676b03a51224ad682d81411a9a6beb448966e6b049ed982508c4108 SHA512 4606ab9666c99b991765c669aff45ad3a7515cb96ad6bbbd152c69b0f198202190096eea3adeed0d2029ecca9173ace410929bc750ad67cf00dbdd9388dfc7ee WHIRLPOOL 45f269a1385e1de02940985fc0a263d6eefaf51153e0c5b0916c075bc8c325066e8b7da5ab6b46ce377fe56e12761d17a5930503f416f95ca652d7b42cac1b5c
+MISC ChangeLog 10759 SHA256 1634b7037f27499dbc3f65796552d05c7512b5fb6a502596510637cb42a30f7e SHA512 5e7ad3d348f3d4c0c2ed31dd3ae17a1ce350ec5ead74f6a1bb1f26b6c5921d839ffaff862275dad4b3e07f4fab34955cad44ef195f89f15aaf8ef0285dd4bf7b WHIRLPOOL a07adef46b4a43535bd0fca4ba803c6b7fb80e2abd6522459ce708c0501e03690c632ab1244c15fd6c7bef18d59517cca2c120850c9e7f6d2b905420e8e836ab
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUhEGvAAoJELp701BxlEWfJroQAIDzMNaVsVphK05BCE+lPPnD
-5f5G/TRRwL/iWiQNdGTsnhgMtmPEeGIN4yZjbS4/DckatJvU9jqFCn8HFTNPMJY4
-iHHHLoKdNg2VDh5ZeHTkZh6jDzBtr5I7tnvTOdTHQz0hYLmqSK7ROfwIrAHw+AFK
-i0vX0RWovIi34AA9g+OUmCm5/2IM9jDNv7rqIst2QhkehkgIB9LaPsXWfnfSa8sr
-hGQvdekG97PE5vutwSgqN8h+5uQz8gQjTxZCMnOBuTXjxgCmh6yy2zXSsG9qelGI
-JtlF/qdw+QExqRGikMaYrcOD+USAJ54rOo3aFI6njbYlMWHIVvj/iuVs9TQbD67A
-YrOqnct2DS1nf+xGTbxP+s3zFel9O7JpCCoVlLBBR8LUn6Hly1qhXzudSdY+sK1o
-Tgey7eYS5uI0s6aXskf6lQTfOzPde97tjuPL9EnzK2X3pmTu69ZCCpntDR5K24sy
-b6nlNqwzLBdi4msoZtKvcsstTtCqOBYwgHaZTLikgu+4WSNWvk/Of0E3OWqU3QBF
-IfT6BHkPmRLruwHWonlLGutFcmuYX4VlDOFV2m3HkyZ8kNx7ysIDL+/DvhOwCFk8
-SAXGnXC3E0IZhVLD3xRfP+QxtRuGyOt0BsryY1mmstrVxzPLUkkAE90jFXBS+ZcJ
-Bc6jEwbr//25E9Q8rSLf
-=xykU
+iEYEAREIAAYFAlSU8vMACgkQso7CE7gHKw2UPgCfeNQh4vWX/smi6BL4Sqeqjrun
+jS8AoJb6Jd62e2DQiZx78YxPymKc6nfh
+=10oa
 -----END PGP SIGNATURE-----

diff --git a/dev-python/cherrypy/cherrypy-2.3.0.ebuild b/dev-python/cherrypy/cherrypy-2.3.0.ebuild
deleted file mode 100644 (file)
index 4c903ab..0000000
--- a/dev-python/cherrypy/cherrypy-2.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.3.0.ebuild,v 1.4 2010/11/14 21:05:42 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_P="CherryPy-${PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
-SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools
-       test? ( >=dev-python/webtest-1.0 )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       # Remove test_cache_filter, only works outside of portage
-       sed -i \
-               -e '/raw_input/d' \
-               -e "/'test_cache_filter',/d" \
-               cherrypy/test/test.py || die "sed failed"
-
-       sed -i \
-               -e 's/"cherrypy.tutorial",//' \
-               -e "/('cherrypy\/tutorial',/, /),/d" \
-               -e 's/distutils.core/setuptools/' \
-               setup.py || die "sed failed"
-}
-
-src_test() {
-       testing() {
-               PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" cherrypy/test/test.py
-       }
-       python_execute_function testing
-}
-
-src_install() {
-       distutils_src_install
-
-       if use doc; then
-               insinto /usr/share/doc/${PF}
-               doins -r cherrypy/tutorial
-       fi
-}

diff --git a/dev-python/cherrypy/cherrypy-3.2.0.ebuild b/dev-python/cherrypy/cherrypy-3.2.0.ebuild
deleted file mode 100644 (file)
index 1b1d9b8..0000000
--- a/dev-python/cherrypy/cherrypy-3.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.0.ebuild,v 1.6 2011/04/23 18:16:03 armin76 Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_P="CherryPy-${PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
-SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       distutils_src_prepare
-       sed -i \
-               -e 's/"cherrypy.tutorial", //' \
-               -e "/('cherrypy\/tutorial',/,/),/d" \
-               setup.py || die "sed failed"
-}
-
-src_test() {
-       testing() {
-               PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests -P -s py$(python_get_version --major)/cherrypy/test
-       }
-       python_execute_function testing
-#      python_execute_nosetests -e -P 'build-${PYTHON_ABI}/lib' -- -P -s 'py$(python_get_version --major)/cherrypy/test'
-}
-
-src_install() {
-       distutils_src_install
-
-       delete_tests() {
-               rm -fr "${ED}$(python_get_sitedir)/cherrypy/test"
-       }
-       python_execute_function -q delete_tests
-
-       if use doc; then
-               insinto /usr/share/doc/${PF}
-               # py2/cherrypy/tutorial and py3/cherrypy/tutorial are identical.
-               doins -r py3/cherrypy/tutorial || die "Installation of documentation failed"
-       fi
-}

diff --git a/dev-python/cherrypy/cherrypy-3.2.1.ebuild b/dev-python/cherrypy/cherrypy-3.2.1.ebuild
deleted file mode 100644 (file)
index a7a2a1c..0000000
--- a/dev-python/cherrypy/cherrypy-3.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.1.ebuild,v 1.2 2011/12/28 22:44:07 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_P="CherryPy-${PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
-SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       distutils_src_prepare
-       sed -i \
-               -e 's/"cherrypy.tutorial", //' \
-               -e "/('cherrypy\/tutorial',/,/),/d" \
-               -e "/LICENSE.txt/d" \
-               setup.py || die "sed failed"
-}
-
-src_test() {
-       distutils_src_test < /dev/tty
-}
-
-src_install() {
-       distutils_src_install
-
-       delete_tests() {
-               rm -fr "${ED}$(python_get_sitedir)/cherrypy/test"
-       }
-       python_execute_function -q delete_tests
-
-       if use doc; then
-               insinto /usr/share/doc/${PF}
-               doins -r cherrypy/tutorial || die "Installation of documentation failed"
-       fi
-}

diff --git a/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild b/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild
deleted file mode 100644 (file)
index 342d3ec..0000000
--- a/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,48 +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/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.10 2014/03/31 20:48:31 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_P="CherryPy-${PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
-SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-# Both req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-DISTUTILS_NO_PARALLEL_BUILD=1
-
-python_prepare_all() {
-       sed -e 's:test_file_stream:_&:' -i cherrypy/test/test_static.py || die
-       distutils-r1_python_prepare_all
-}
-
-python_test() {
-       # https://bitbucket.org/cherrypy/cherrypy/issue/1308/testsuite-failures-x-5-test_file_stream
-       if python_is_python3; then
-               sed -e 's:test_HTTP11_pipelining:_&:' -i cherrypy/test/test_conn.py || die
-       elif [[ "${EPYTHON}" == "pypy-c2.0" || "${EPYTHON}" == "pypy-c" ]]; then
-               einfo "done"
-               sed -e 's:testEscapedOutput:_&:' \
-                       -e 's:testNormalReturn:_&:' \
-                       -e 's:testTracebacks:_&:' \
-                       -e 's:testNormalYield:_&:' \
-                       -i cherrypy/test/test_logging.py || die
-       fi
-       # This really doesn't sit well with multiprocessing
-       nosetests < /dev/tty || die "Testing failed with ${EPYTHON}"
-}

diff --git a/dev-python/cherrypy/cherrypy-3.2.2.ebuild b/dev-python/cherrypy/cherrypy-3.2.2.ebuild
deleted file mode 100644 (file)
index 4b34a98..0000000
--- a/dev-python/cherrypy/cherrypy-3.2.2.ebuild
+++ /dev/null
@@ -1,54 +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/cherrypy/cherrypy-3.2.2.ebuild,v 1.2 2012/07/17 02:07:57 vapier Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_P="CherryPy-${PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
-SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       distutils_src_prepare
-       sed -i \
-               -e 's/"cherrypy.tutorial", //' \
-               -e "/('cherrypy\/tutorial',/,/),/d" \
-               -e "/LICENSE.txt/d" \
-               setup.py || die "sed failed"
-}
-
-src_test() {
-       distutils_src_test < /dev/tty
-}
-
-src_install() {
-       distutils_src_install
-
-       delete_tests() {
-               rm -fr "${ED}$(python_get_sitedir)/cherrypy/test"
-       }
-       python_execute_function -q delete_tests
-
-       if use doc; then
-               insinto /usr/share/doc/${PF}
-               doins -r cherrypy/tutorial
-       fi
-}

diff --git a/dev-python/cherrypy/cherrypy-3.2.5.ebuild b/dev-python/cherrypy/cherrypy-3.2.5.ebuild
deleted file mode 100644 (file)
index f1e6adc..0000000
--- a/dev-python/cherrypy/cherrypy-3.2.5.ebuild
+++ /dev/null
@@ -1,48 +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/cherrypy/cherrypy-3.2.5.ebuild,v 1.2 2014/04/05 21:07:43 floppym Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_P="CherryPy-${PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
-SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-       "${FILESDIR}"/cherrypy-3.2.5-issue1234.patch
-)
-
-python_prepare_all() {
-       # Prevent interactive failures (hangs) in the test suite
-       sed -i -e "s/interactive = True/interactive = False/" cherrypy/test/webtest.py || die
-       distutils-r1_python_prepare_all
-}
-
-python_test() {
-       # Failure in test_file_stream
-       # https://bitbucket.org/cherrypy/cherrypy/issue/1308/testsuite-failures-x-5-test_file_stream
-
-       # This really doesn't sit well with multiprocessing
-       nosetests -e test_file_stream < /dev/tty || die "Testing failed with ${EPYTHON}"
-}
-
-src_test() {
-       DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}

diff --git a/dev-python/cherrypy/cherrypy-3.3.0.ebuild b/dev-python/cherrypy/cherrypy-3.3.0.ebuild
index 62011fe63e75cc9ff9241e629cd9c630a0bf1203..1fa7ba7d7f1ff64a66d36e48709141f2aa6d20d7 100644 (file)
--- a/dev-python/cherrypy/cherrypy-3.3.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.3.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/cherrypy/cherrypy-3.3.0.ebuild,v 1.8 2014/12/07 12:01:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.3.0.ebuild,v 1.9 2014/12/20 03:54:09 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -51,7 +51,3 @@ python_test() {
                nosetests "${exclude[@]}" < /dev/tty || die "Testing failed with ${EPYTHON}"
        fi
 }
-
-src_test() {
-       DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}

diff --git a/dev-python/cherrypy/files/cherrypy-3.2.5-issue1234.patch b/dev-python/cherrypy/files/cherrypy-3.2.5-issue1234.patch
deleted file mode 100644 (file)
index fd76c5e..0000000
--- a/dev-python/cherrypy/files/cherrypy-3.2.5-issue1234.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://bitbucket.org/cherrypy/cherrypy/issue/1234
-
---- cherrypy/test/test_tools.py
-+++ cherrypy/test/test_tools.py
-@@ -407,4 +407,4 @@
-         sa = cherrypy.lib.cptools.SessionAuth()
-         res = sa.login_screen(None, username=unicodestr('nobody'),
-             password=unicodestr('anypass'))
--        self.assertIsInstance(res, bytestr)
-+        self.assertTrue(isinstance(res, bytestr))