From: Tiziano Müller Date: Tue, 27 Feb 2007 22:47:19 +0000 (+0000) Subject: Re-added version 2.2.1 since upstream still maintains that branch it is needed by... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a21a267a985a661b6ec0e3c8670d9f4d3f14b92;p=gentoo.git Re-added version 2.2.1 since upstream still maintains that branch it is needed by Turbogears. Added doc USE-flags for tutorial installation. Package-Manager: portage-2.1.2-r10 --- diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog index b986311ef3d3..2eed41b188c7 100644 --- a/dev-python/cherrypy/ChangeLog +++ b/dev-python/cherrypy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/cherrypy # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.18 2007/02/27 21:10:21 lucass Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.19 2007/02/27 22:47:19 dev-zero Exp $ + + 27 Feb 2007; Tiziano Müller +cherrypy-2.2.1.ebuild, + -cherrypy-3.0.0.ebuild, cherrypy-3.0.1.ebuild: + Re-added version 2.2.1 since upstream still maintains that branch and it is + needed by Turbogears. Added doc USE-flags for tutorial installation. *cherrypy-3.0.1 (27 Feb 2007) diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest index d90e094e9a82..f7c5f5b06eee 100644 --- a/dev-python/cherrypy/Manifest +++ b/dev-python/cherrypy/Manifest @@ -1,29 +1,26 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX cherrypy-2.1.1-test-gentoo.patch 260 RMD160 76705521adab4ce2c131e551a87344a1901fa7aa SHA1 b48c5a01b33bb253b7a2434388dd544df9dd42b4 SHA256 f5ee1a1295e2dc6f9658adabbceafc513248c156d5d94d1751616d6c325aeaa2 MD5 4cf9009699f529b3c7921c0e1ab0cc94 files/cherrypy-2.1.1-test-gentoo.patch 260 RMD160 76705521adab4ce2c131e551a87344a1901fa7aa files/cherrypy-2.1.1-test-gentoo.patch 260 SHA256 f5ee1a1295e2dc6f9658adabbceafc513248c156d5d94d1751616d6c325aeaa2 files/cherrypy-2.1.1-test-gentoo.patch 260 DIST CherryPy-2.1.1.tar.gz 177839 RMD160 9f310f96fe6f8046a6e05fef6b855e66018d48be SHA1 fde88381b93b58ade3275d8c73eea49cc4f2098c SHA256 2edb7213b030c116c53bbe5bc72c85e2978ed2aa515b6ba9560c8a8ce8968cf0 -DIST CherryPy-3.0.0.tar.gz 253348 RMD160 e162013d2b7cbb0ee1020c96653d7c26f6fa6481 SHA1 8deb77b5ce9f80ba58ac010824636a609ec909c4 SHA256 84dfd1661451c300d80eed214f9280f4caeae075833718a6e539e3f45c881561 +DIST CherryPy-2.2.1.tar.gz 219932 RMD160 c8f406c5eaedb6f710dc746528b8474df48cb3c8 SHA1 cda044ceed78059a56c54ce157bca564f4907a51 SHA256 af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b DIST CherryPy-3.0.1.tar.gz 262276 RMD160 e74265cc9e221582fd20ce5e236bef9ab72db8df SHA1 7a0e9020ec91fde21c12b412a096b53af2f0ec6a SHA256 c2d58d02d9b0b5772a52355136c1085fbaf14f6689f849eea41f4fe8bd573886 EBUILD cherrypy-2.1.1.ebuild 919 RMD160 264f6cd68aaff2f9dfaf423045cd2241461925b8 SHA1 cc07b01c681e7642e775457efb21aba755bbad91 SHA256 9992bd112bacf4de1d8342f5448540a311119729c51cfee192202a23b0de086c MD5 891f28e74476f31afe88fde6d41c3eab cherrypy-2.1.1.ebuild 919 RMD160 264f6cd68aaff2f9dfaf423045cd2241461925b8 cherrypy-2.1.1.ebuild 919 SHA256 9992bd112bacf4de1d8342f5448540a311119729c51cfee192202a23b0de086c cherrypy-2.1.1.ebuild 919 -EBUILD cherrypy-3.0.0.ebuild 640 RMD160 b0879c866d64b89c2c573976b434304daddb7c84 SHA1 8bbeb6766da190d9422fc3f671f0a1d3392fb70b SHA256 00116beb230d33875ca297483e3878c2193e7801c0af76caa6ea48cc2c57d197 -MD5 fbc97b66e32f1a04a4784f1475c9f009 cherrypy-3.0.0.ebuild 640 -RMD160 b0879c866d64b89c2c573976b434304daddb7c84 cherrypy-3.0.0.ebuild 640 -SHA256 00116beb230d33875ca297483e3878c2193e7801c0af76caa6ea48cc2c57d197 cherrypy-3.0.0.ebuild 640 -EBUILD cherrypy-3.0.1.ebuild 621 RMD160 dc433d2016bb5072700391ed30e95a02c1bad4bc SHA1 3f44f8953a74c7b1e311a2a1a4bb21d8e6584c81 SHA256 9c0063264cdda9f07b27e23662c94ed09e71a662d5ee91b7e3e48d88b0c85f9a -MD5 16718a02b72c04188051a4df2ab21989 cherrypy-3.0.1.ebuild 621 -RMD160 dc433d2016bb5072700391ed30e95a02c1bad4bc cherrypy-3.0.1.ebuild 621 -SHA256 9c0063264cdda9f07b27e23662c94ed09e71a662d5ee91b7e3e48d88b0c85f9a cherrypy-3.0.1.ebuild 621 -MISC ChangeLog 3418 RMD160 e832cf0ec0558c76c048987f903148093d187c16 SHA1 a9a50e0ddfd9fb0f5a9024d50c8fdc3f12a038ca SHA256 d80ea1b69a9c7611f534840aa234cbcccdc9e48ea8296c4353003168e855bc5b -MD5 28161680a5630f587d09bb08c307fc06 ChangeLog 3418 -RMD160 e832cf0ec0558c76c048987f903148093d187c16 ChangeLog 3418 -SHA256 d80ea1b69a9c7611f534840aa234cbcccdc9e48ea8296c4353003168e855bc5b ChangeLog 3418 +EBUILD cherrypy-2.2.1.ebuild 1016 RMD160 e57b323890f8511cd65d260f6f945f0d005b979e SHA1 604b05b4432c4065ee5b061305582590027947bf SHA256 6662f86d9002fa54f675dbb8939aad0cb858f27e6eec9acd22ad0196bdd48a2f +MD5 69e6adf6614adc787756e999c294c603 cherrypy-2.2.1.ebuild 1016 +RMD160 e57b323890f8511cd65d260f6f945f0d005b979e cherrypy-2.2.1.ebuild 1016 +SHA256 6662f86d9002fa54f675dbb8939aad0cb858f27e6eec9acd22ad0196bdd48a2f cherrypy-2.2.1.ebuild 1016 +EBUILD cherrypy-3.0.1.ebuild 941 RMD160 29adeb9c75eb882c21136af624a94b789840c363 SHA1 6e85b92b794421b2bbd2a46070fc043ef5e716fd SHA256 67f7efaaf55b4cecd913af271f2f9bdc506288911265585e1299e2d33a8556e6 +MD5 269ab421c6b12dd46d4045297d9ba8d0 cherrypy-3.0.1.ebuild 941 +RMD160 29adeb9c75eb882c21136af624a94b789840c363 cherrypy-3.0.1.ebuild 941 +SHA256 67f7efaaf55b4cecd913af271f2f9bdc506288911265585e1299e2d33a8556e6 cherrypy-3.0.1.ebuild 941 +MISC ChangeLog 3696 RMD160 aa32b718722c087cd45dfb4c3d8ff46033a4934c SHA1 e21f725eb7ed64dfa133677e570bb47ac0168a81 SHA256 34d235b7efda56ebc2c8fe9060ce8be861c56eb50bcd3edc48be5cd317078314 +MD5 b48739e52456b1f47f4d8a64f0380166 ChangeLog 3696 +RMD160 aa32b718722c087cd45dfb4c3d8ff46033a4934c ChangeLog 3696 +SHA256 34d235b7efda56ebc2c8fe9060ce8be861c56eb50bcd3edc48be5cd317078314 ChangeLog 3696 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160 @@ -31,16 +28,9 @@ SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a metadata MD5 60fdc3b8837e88c0d4ac74d2ce1b3591 files/digest-cherrypy-2.1.1 244 RMD160 b579fa30e7340b80a2b8ea4f2127b055a2f49531 files/digest-cherrypy-2.1.1 244 SHA256 69e3beefa9d475acf89944a830b82220be1d12bf140772ab5af8a48ac67bd45d files/digest-cherrypy-2.1.1 244 -MD5 3222135487038b3c9f091065dc37cf1b files/digest-cherrypy-3.0.0 244 -RMD160 3217321ab734d69c3f29fca1c810040ec6c1b839 files/digest-cherrypy-3.0.0 244 -SHA256 5b9d5789a05b9bb75cf11214f3d84b0de7f6d1d3577005de8425b538cde3d34f files/digest-cherrypy-3.0.0 244 +MD5 0d16822fb4c8746436069f025091810b files/digest-cherrypy-2.2.1 244 +RMD160 8c70bb340dc185f091b8d5f6ec057174629a076f files/digest-cherrypy-2.2.1 244 +SHA256 8f63ac22513c6bc4d84d9cbf6b62befefc3e8bcee201d8f1d0a62ee866584699 files/digest-cherrypy-2.2.1 244 MD5 f1a92b738a27e82023790fe0b5214b60 files/digest-cherrypy-3.0.1 244 RMD160 225e9a9c471bcd3335efa46c23f19dd136a63ee7 files/digest-cherrypy-3.0.1 244 SHA256 8677c1a0db4fa29529fdc82813c72875ab52125ca2ee871763981fa5cb69c2e3 files/digest-cherrypy-3.0.1 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF5J5J2jLqHNfbg2URAhXtAJwN7dET3r7a+0fI5V0AH1OpjBdfIgCgjOAJ -CrZAnzpAaPOFATCYmS94mEI= -=xQdy ------END PGP SIGNATURE----- diff --git a/dev-python/cherrypy/cherrypy-2.2.1.ebuild b/dev-python/cherrypy/cherrypy-2.2.1.ebuild new file mode 100644 index 000000000000..335d569e0d45 --- /dev/null +++ b/dev-python/cherrypy/cherrypy-2.2.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.2.1.ebuild,v 1.3 2007/02/27 22:47:19 dev-zero Exp $ + +inherit distutils + +MY_P=CherryPy-${PV} + +DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework." +SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz" +HOMEPAGE="http://www.cherrypy.org/" +IUSE="doc" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86" +LICENSE="BSD" + +DEPEND="" +RDEPEND="" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + + sed -i \ + -e '/raw_input/d' \ + cherrypy/test/test.py || die "sed failed" + sed -i \ + -e 's/"cherrypy.tutorial",//' \ + -e "/('cherrypy\/tutorial',/, /),/d" \ + setup.py || die "sed failed" + +} + +src_install() { + distutils_src_install + if use doc ; then + insinto /usr/share/doc/${PF} + doins -r cherrypy/tutorial + fi +} + +src_test() { + PYTHONPATH=. "${python}" cherrypy/test/test.py || die "test failed" +} diff --git a/dev-python/cherrypy/cherrypy-3.0.0.ebuild b/dev-python/cherrypy/cherrypy-3.0.0.ebuild deleted file mode 100644 index d84af5a14abb..000000000000 --- a/dev-python/cherrypy/cherrypy-3.0.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.0.0.ebuild,v 1.1 2006/12/27 02:20:22 dev-zero Exp $ - -inherit distutils - -MY_P=CherryPy-${PV} - -DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework." -SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz" -HOMEPAGE="http://www.cherrypy.org/" -IUSE="" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~x86" -LICENSE="BSD" - -DEPEND="" -RDEPEND="" - -S=${WORKDIR}/${MY_P} - -src_test() { - cd cherrypy/test - python test.py --dumb || die "Test failed." -} diff --git a/dev-python/cherrypy/cherrypy-3.0.1.ebuild b/dev-python/cherrypy/cherrypy-3.0.1.ebuild index 2fbb16e31825..13f69a4e922a 100644 --- a/dev-python/cherrypy/cherrypy-3.0.1.ebuild +++ b/dev-python/cherrypy/cherrypy-3.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.0.1.ebuild,v 1.1 2007/02/27 21:10:21 lucass Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.0.1.ebuild,v 1.2 2007/02/27 22:47:19 dev-zero Exp $ inherit distutils @@ -9,14 +9,35 @@ MY_P=CherryPy-${PV} DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework." SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz" HOMEPAGE="http://www.cherrypy.org/" -IUSE="" +IUSE="doc" SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~x86" LICENSE="BSD" -S="${WORKDIR}/${MY_P}" +DEPEND="" +RDEPEND="" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + + sed -i \ + -e 's/"cherrypy.tutorial",//' \ + -e "/('cherrypy\/tutorial',/, /),/d" \ + setup.py || die "sed failed" + +} + +src_install() { + distutils_src_install + if use doc ; then + insinto /usr/share/doc/${PF} + doins -r cherrypy/tutorial + fi +} src_test() { - cd cherrypy/test - ${python} test.py --dumb || die "Test failed." + PYTHONPATH=. "${python}" cherrypy/test/test.py --dumb || die "test failed" } diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.2.1 b/dev-python/cherrypy/files/digest-cherrypy-2.2.1 new file mode 100644 index 000000000000..9c6163b20695 --- /dev/null +++ b/dev-python/cherrypy/files/digest-cherrypy-2.2.1 @@ -0,0 +1,3 @@ +MD5 14bf17b0706bc480342cb8fcfaed74cd CherryPy-2.2.1.tar.gz 219932 +RMD160 c8f406c5eaedb6f710dc746528b8474df48cb3c8 CherryPy-2.2.1.tar.gz 219932 +SHA256 af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b CherryPy-2.2.1.tar.gz 219932 diff --git a/dev-python/cherrypy/files/digest-cherrypy-3.0.0 b/dev-python/cherrypy/files/digest-cherrypy-3.0.0 deleted file mode 100644 index 266adda27fa8..000000000000 --- a/dev-python/cherrypy/files/digest-cherrypy-3.0.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 2065d19e79c9c1b30c9327509d2f3d0e CherryPy-3.0.0.tar.gz 253348 -RMD160 e162013d2b7cbb0ee1020c96653d7c26f6fa6481 CherryPy-3.0.0.tar.gz 253348 -SHA256 84dfd1661451c300d80eed214f9280f4caeae075833718a6e539e3f45c881561 CherryPy-3.0.0.tar.gz 253348