From 629f1c041e9dca063e16818e2930ac635ddaf9ef Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Tue, 6 Apr 2010 15:20:59 +0000 Subject: [PATCH] Set SUPPORT_PYTHON_ABIS. Package-Manager: portage-HEAD/cvs/Linux x86_64 --- dev-python/pythong/ChangeLog | 8 ++- dev-python/pythong/Manifest | 4 +- dev-python/pythong/pythong-2.1.5-r1.ebuild | 73 ++++++++++++---------- 3 files changed, 49 insertions(+), 36 deletions(-) diff --git a/dev-python/pythong/ChangeLog b/dev-python/pythong/ChangeLog index 964617b19d8b..3b115bf56e42 100644 --- a/dev-python/pythong/ChangeLog +++ b/dev-python/pythong/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pythong -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.19 2009/02/03 22:52:28 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.20 2010/04/06 15:20:59 arfrever Exp $ + + 06 Apr 2010; Arfrever Frehtes Taifersar Arahesis + pythong-2.1.5-r1.ebuild: + Set SUPPORT_PYTHON_ABIS. 03 Feb 2009; Patrick Lauer pythong-2.1.5-r1.ebuild: Changing doins to -r because these are directories. Fixes #249379 diff --git a/dev-python/pythong/Manifest b/dev-python/pythong/Manifest index 384844cad09d..29e168761f11 100644 --- a/dev-python/pythong/Manifest +++ b/dev-python/pythong/Manifest @@ -2,6 +2,6 @@ DIST python.pdf 2547987 RMD160 664ac62006584494c6d60ad734384c2b78fcc4ae SHA1 f20 DIST pythonG-2_1_2.tgz 392294 RMD160 8d0b59b62881d20b1c39872246ced8a958df032c SHA1 ca389938c6cf75731e0f4741a89c7f36d094e569 SHA256 08b71559e218aabc44ca11ac796413d4ea57c0b793ebf44024c2745b01ed0a2b DIST pythonG-2_1_5.tgz 397754 RMD160 e407ea8a92a4451af6331d19b94c0970201a91f4 SHA1 9b455961acb321963a81535de34426824c5b3967 SHA256 6bc89217bfd89717eddd3b27682bb783446bcd3d87ed450e943e0369fa2c9243 EBUILD pythong-2.1.2.ebuild 1367 RMD160 a26eb8e2c87cf5e3a1dee20d9a2b1117e8df91d2 SHA1 cd2525775757e77576e00d7f3cefd1bf09ac94f3 SHA256 2496d4422bee9fe216ed907d0f017ff71b396c99d33720172753baec48a498f9 -EBUILD pythong-2.1.5-r1.ebuild 1607 RMD160 ffcae19f01a6adbebcd21583d41563d2932ebc22 SHA1 e46308acb93e214f6d46f4511f861212751543b6 SHA256 8dd9d29c3271e112ec406317b902458368b456fdabf100771a4d3b899ccde31e -MISC ChangeLog 2609 RMD160 0097d0ac7521c74c362b2d4a385da1f769e7f9b0 SHA1 f2c54eb9042b1ff0b329a5688a195c05856ee081 SHA256 6a8caabe636900340b26d3f14079d5133feb8fdfdf0a6803e7d954eb7d657cc7 +EBUILD pythong-2.1.5-r1.ebuild 1940 RMD160 177552c005cc8a5672d86ff5702106cf5fdbadff SHA1 d85b342c91925938c70a9aa804c2948cee37c29b SHA256 54085a84b67245ad850ddf1e76b01522743a221329f3d9244db9ffdbde6933b6 +MISC ChangeLog 2738 RMD160 645a0bc15f178147835459c18aae28c0ed37b78c SHA1 ee8b721883ed30009968297fa02cb2da7b67f959 SHA256 6b644784e04cb4cbccae83ff30be70a8b9648c1c1d48b91bee526da320a07e17 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 diff --git a/dev-python/pythong/pythong-2.1.5-r1.ebuild b/dev-python/pythong/pythong-2.1.5-r1.ebuild index 0d0ae58e0cc2..a796bba58d89 100644 --- a/dev-python/pythong/pythong-2.1.5-r1.ebuild +++ b/dev-python/pythong/pythong-2.1.5-r1.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.2 2009/02/03 22:52:28 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.5-r1.ebuild,v 1.3 2010/04/06 15:20:59 arfrever Exp $ -EAPI="2" -inherit python distutils multilib +EAPI="3" +PYTHON_DEPEND="2" +PYTHON_USE_WITH="tk" +SUPPORT_PYTHON_ABIS="1" + +inherit python MY_PN="pythonG" MY_PV=${PV/_/-} @@ -19,49 +23,54 @@ KEYWORDS="~amd64 ~ia64 ~x86" SLOT="0" IUSE="doc" -S=${WORKDIR}/${MY_PN}-${MY_PV} +S="${WORKDIR}/${MY_PN}-${MY_PV}" -RDEPEND=">=dev-lang/python-2.2.2[tk] - >=dev-lang/tk-8.3.4 +RDEPEND=">=dev-lang/tk-8.3.4 >=dev-python/pmw-1.2" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -PYTHON_MODNAME="libpythong" +DEPEND="${RDEPEND}" +RESTRICT_PYTHON_ABIS="3.*" src_prepare() { - default - - python_version - - sed -i \ - -e "s:^\(fullpath = \).*:\1'/usr/$(get_libdir)/python${PYVER}/site-packages/':" \ - -e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \ - pythong.py || die "sed in pythong.py failed" -} - -src_compile() { - : + python_copy_sources + + preparation() { + sed -i \ + -e "s:^\(fullpath = \).*:\1'$(python_get_sitedir)':" \ + -e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \ + pythong.py || die "sed in pythong.py failed" + } + python_execute_function -s preparation } src_install() { - python_version + installation() { + insinto $(python_get_sitedir) + doins modulepythong.py || die "doins failed" + doins -r libpythong || die "doins failed" - insinto $(python_get_sitedir) - 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" + python_convert_shebangs $(python_get_version) "${ED}usr/bin/pythong.py-${PYTHON_ABI}" + } + python_execute_function -s installation - exeinto /usr/bin - doexe pythong.py || die "doexe failed" + python_generate_wrapper_scripts "${ED}usr/bin/pythong.py" dodoc leeme.txt || die "dodoc failed" insinto /usr/share/doc/${PF} doins -r {LICENCIA,MANUAL,demos} || die "doins failed" - rm -f "${D}"/usr/share/doc/"${PF}"/demos/modulepythong.py + rm -fr "${ED}/usr/share/doc/${PF}/demos/modulepythong.py" if use doc; then insinto /usr/share/doc/${PF} - doins "${DISTDIR}"/python.pdf + doins "${DISTDIR}/python.pdf" fi } + +pkg_postinst() { + python_mod_optimize libpythong +} + +pkg_postrm() { + python_mod_cleanup libpythong +} -- 2.26.2