From: Justin Lecher Date: Sat, 21 Mar 2015 15:59:36 +0000 (+0000) Subject: use dobin instead of exeinto /usr/bin/ && doexe; bump to EAPI=5 and new python eclasses X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=250163de41571cf2b53819b5ccf812eb59302b84;p=gentoo.git use dobin instead of exeinto /usr/bin/ && doexe; bump to EAPI=5 and new python eclasses Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- diff --git a/dev-python/pythong/ChangeLog b/dev-python/pythong/ChangeLog index 872fefcf8758..ed31f440e892 100644 --- a/dev-python/pythong/ChangeLog +++ b/dev-python/pythong/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pythong -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.24 2013/01/22 19:06:03 jlec Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.25 2015/03/21 15:59:31 jlec Exp $ + +*pythong-2.1.5-r2 (21 Mar 2015) + + 21 Mar 2015; Justin Lecher +pythong-2.1.5-r2.ebuild, + pythong-2.1.5-r1.ebuild: + use dobin instead of exeinto /usr/bin/ && doexe; bump to EAPI=5 and new python + eclasses 22 Jan 2013; Justin Lecher pythong-2.1.5-r1.ebuild, metadata.xml: @@ -94,4 +101,3 @@ 10 May 2003; Alastair Tse pythong-2.0.21.2.ebuild: initial ebuild. thanks to Federico Moro . Bug #20113. - diff --git a/dev-python/pythong/Manifest b/dev-python/pythong/Manifest index 537eb35c0705..e3730b35036d 100644 --- a/dev-python/pythong/Manifest +++ b/dev-python/pythong/Manifest @@ -3,13 +3,26 @@ Hash: SHA512 DIST python.pdf 2547987 SHA256 20e17f365b9f2c5ab0bed656a1ff8797b22b079a238a278674879b807bfd9dd4 SHA512 9d16eb39ff5996be70aa41cb758e73adf1fa72a7e83613626cf6f519def99fd30169a87b1e918902e1aecfb75d925cb7e49d9ad5733dd5274b9a351adaaf201e WHIRLPOOL 47fbcc853901e1df938e20fca1b18adca8985607d1edae60132b5b9490e8f6c1af39733186d079fac32e7e26a28bf7148062e108ad6c748dd110c2860520a49b DIST pythonG-2_1_5.tgz 397754 SHA256 6bc89217bfd89717eddd3b27682bb783446bcd3d87ed450e943e0369fa2c9243 SHA512 8a8c3ada425a1d7a0565e495494a8edfcf8b4224cb93ea843669e4d0b2ca9e122d038c728ff8242885e0b320caa6db8ef8f721f99c423b7a8f87a83a4e6f51c6 WHIRLPOOL 072f65639f5a371bf9a27885bc4f515e91f7abe0d6599457f167a7a81e493d8e12bc83d1520d5278421bc34bd1fd6c1c35d849dc653ea8754364c8c81528153e -EBUILD pythong-2.1.5-r1.ebuild 1939 SHA256 c5374f394f59c396e064cfbf93cca29352a4ee83c5a78200530b55ac1846b64b SHA512 0c6853be357b97f35d50a6c05b80d5d0a81756872eeb7468fde62010bc0fa7aa13ce1752a40183d52b19c9f03d38785e3f5321244e0bab307c0aadc4b0932fa6 WHIRLPOOL 679bba8b88fea3ca8a0fbeaf768591b44d8dc9bf58e47ca433c9a113c1020817ef8ac32cf2e8ef530415b9c513431e1c50ac45cd700dbc35e7a6aa7e91c0da0f -MISC ChangeLog 3168 SHA256 247e7fc7d70ee313218a7732ed29b2cd8f014f6fa2d8449ce1d591c528640889 SHA512 5ce4d296c6b5aba47b1f587747d60a3ea7cf3493b0e20f412e3dbe5ea360cb865948e1256c267ece82735215853a2aebc8830e49f067adeeeed3a7e01c2d3582 WHIRLPOOL e7ddb913fc1a8dfb849f78fa9a1978048af8c8d34bf6802a00e359ca6465cde2ecd58bd1eade9225886f7320c1737cfb1aa709de3d44d2faaa70fe2f06337c8a +EBUILD pythong-2.1.5-r1.ebuild 1927 SHA256 98e93e7d73c67637a64918b88cca011ae6cdbd75ef2734808fe2fa06f4659577 SHA512 3ac6dc928dc3dcb4d0c128b82d1f1f6ad05e2c0f6b94151fc301fd34b8cc0081da305a4f1f9f2285dceb899029ecea4a22dcf29993573923b9083f6ff98dd8d6 WHIRLPOOL 5d4a04f6d6195ea3a3b721e9ec1fe08bb9adc71b6a2f1ccadebcaadf14774251c1ae066618ef7820ec1caf0cd7a79c513de516c0b463176646c38b21a990aacd +EBUILD pythong-2.1.5-r2.ebuild 1359 SHA256 8b5ce58b411099fbf30b7603b88baad14235f016f60cdcf536c229f71d3c014a SHA512 04e47e683978246c7093ef01056b744770e8a8d24141a9a7ecf71f661ac514ec74defd05ba03515f714242b557a62b855fd600ec52691bd9bddb8742901e497a WHIRLPOOL 37f4b2702afc5777bbe727e0c89a1387e9b95af69d43187c65dcf54469e8674f2a3edc949b60a35c1aac68722b11137647857cdd24337b92a2e0bd32f0667ec1 +MISC ChangeLog 3393 SHA256 22c8654006a81a68e4c16a56bd197b48a650c26f4f2e1848ea20eb538315df3e SHA512 a3349fd5ab617d6b0a826eabc965fc16b5f284e9e37b6b6bcb9f76da1e6b91be97e329755047ba760ff896c530e85afa2afacd0264f03dd2777b7c3bf36456f5 WHIRLPOOL cc0956afabb49bf198cc7aeab81dfa9de01a73fad24bab68300d8bce0018105d3ac1631c82ffb6bb7becb216b7eeacb018a555314b4a6479f86c48cc8e48e943 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0 -iEYEAREKAAYFAlD+4yAACgkQgAnW8HDreRaYowCgg6hTsxJtzeOa/PcY9u8JC6a1 -bEUAoKlwob8GvUgO6qXmUWfMNqfJUfsf -=tild +iQJ8BAEBCgBmBQJVDZVoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5wAP/2I1+dyFZ7/MYZhtsfvy3Xyt +PKco+V7SiZCI/nMksIhxKXhk3nbFSSBFhBy2D3XDQEVrAYKA6/cf6HKEiYZX87d/ +dSNq2udLD7Z7Glig0YQe3QAWm21FOGx+B1HCaiai0DIn4LVCQPJkQkKJVSIhLUtH +pXuTvpexirPypaSG6+2vS+kPZGppdQxTpKFv3MB7M10YqsTfzO/y26tqnodrSLmc +0GCxV2hW9dNurtWGxY0+sRN4JmaRMZdndHHpQZa63UCAaIFvsitjbbFpwvxxNooO +vRiZo7UoaFJrf5b9iSmZrxcl6NyVNlc2I5xQKsP8HhZkTlpc5niKyDB/P9m9ppR7 +S7Cl5htxpFf0V8D3yzB4Bu3vp3XYAUnk9F0OVL4EAOvTVPe1y8VlIZoshoZfao3Y +O1b0nUV5Lm8xCXxMqtm5MtQAzIo4ShVge2Xwt1eBbSidG2+i2qwooitpfNs5JJcH +GqWAYIhfbn+Uf35VvEW1FjiTXyswOBUQ/Kolgq3S/qdurUfrlYe+ggdaS4eeDStJ +2ihc/AnCChGvkPaVFxFkk6YFDF8Q9ZJayyDPsi2HEgssO9fZovQpKXYPovEDOthi +EJVUJ8irtxJZKSguPB4gld+IhMVusGP5bdJP0c8aztLvWDuwI0RNF4vjw8YDh1NB +xJsSl0ZeYMpiz4Q+UPyO +=VMeE -----END PGP SIGNATURE----- diff --git a/dev-python/pythong/pythong-2.1.5-r1.ebuild b/dev-python/pythong/pythong-2.1.5-r1.ebuild index a85538cd4c12..fedd27a6cfad 100644 --- a/dev-python/pythong/pythong-2.1.5-r1.ebuild +++ b/dev-python/pythong/pythong-2.1.5-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.5-r1.ebuild,v 1.7 2013/01/22 19:06:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.5-r1.ebuild,v 1.8 2015/03/21 15:59:31 jlec Exp $ EAPI="3" + PYTHON_USE_WITH="tk" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" @@ -14,9 +15,10 @@ MY_PV=${PV/_/-} MY_PV=${MY_PV//\./_} DESCRIPTION="Nice and powerful spanish development environment for Python" -SRC_URI="http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz - doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )" HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html" +SRC_URI=" + http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz + doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )" LICENSE="GPL-2" KEYWORDS="~amd64 ~ia64 x86" @@ -25,7 +27,8 @@ IUSE="doc" S="${WORKDIR}/${MY_PN}-${MY_PV}" -RDEPEND=">=dev-lang/tk-8.3.4 +RDEPEND=" + >=dev-lang/tk-8.3.4:0 >=dev-python/pmw-1.2:0" DEPEND="${RDEPEND}" @@ -33,10 +36,10 @@ src_prepare() { python_copy_sources preparation() { - sed -i \ + sed \ -e "s:^\(fullpath = \).*:\1'$(python_get_sitedir)':" \ -e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \ - pythong.py || die "sed in pythong.py failed" + -i pythong.py || die "sed in pythong.py failed" } python_execute_function -s preparation } @@ -47,8 +50,7 @@ src_install() { doins modulepythong.py || die "doins failed" doins -r libpythong || die "doins failed" - exeinto /usr/bin - newexe pythong.py pythong.py-${PYTHON_ABI} || die "doexe failed" + newbin pythong.py pythong.py-${PYTHON_ABI} || die "doexe failed" python_convert_shebangs $(python_get_version) "${ED}usr/bin/pythong.py-${PYTHON_ABI}" } python_execute_function -s installation diff --git a/dev-python/pythong/pythong-2.1.5-r2.ebuild b/dev-python/pythong/pythong-2.1.5-r2.ebuild new file mode 100644 index 000000000000..d347083ec7ab --- /dev/null +++ b/dev-python/pythong/pythong-2.1.5-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.5-r2.ebuild,v 1.1 2015/03/21 15:59:31 jlec Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +PYTHON_REQ_USE="tk" + +inherit python-single-r1 + +MY_PN="pythonG" +MY_PV=${PV/_/-} +MY_PV=${MY_PV//\./_} + +DESCRIPTION="Nice and powerful spanish development environment for Python" +HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html" +SRC_URI=" + http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz + doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ia64 ~x86" +SLOT="0" +IUSE="doc" + +RDEPEND=" + >=dev-lang/tk-8.3.4:0= + >=dev-python/pmw-1.2:0" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${MY_PV}" + +src_prepare() { + sed \ + -e "s:^\(fullpath = \).*:\1'$(python_get_sitedir)':" \ + -e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \ + -i pythong.py || die "sed in pythong.py failed" +} + +src_install() { + python_domodule modulepythong.py libpythong + python_doscript pythong.py + + dodoc leeme.txt + insinto /usr/share/doc/${PF} + doins -r {LICENCIA,MANUAL,demos} + rm -fr "${ED}/usr/share/doc/${PF}/demos/modulepythong.py" || die + + if use doc; then + insinto /usr/share/doc/${PF} + doins "${DISTDIR}"/python.pdf + fi + python_optimize +}