| Summary: | Request for acceptance of Prefix modifications to dev-python ebuilds | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Fabian Groffen <grobian> |
| Component: | New packages | Assignee: | Python Gentoo Team <python> |
| Status: | RESOLVED OBSOLETE | ||
| Severity: | normal | CC: | prefix |
| Priority: | High | ||
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | All | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
merged all but wxpython, since for that the aqua USE-flag needs to be propagated into wxGTK, python and gtk+ Hey :) i found a problem with the twisted ebuild. i guess this hunk is missing for prefix support:
--- twisted-9.0.0-r1.ebuild 12 Jan 2010 10:49:13 -0000 1.1
+++ twisted-9.0.0-r1.ebuild 13 Jan 2010 10:09:55 -0000
@@ -79,7 +79,7 @@
python_generate_wrapper_scripts -E -f -q "${D%/}${EPREFIX}/usr/bin/trial"
create_twisted_egg-info() {
- touch "${D}$(python_get_sitedir)/Twisted-${PV}-py${PYTHON_ABI}.egg-info"
+ touch "${D%/}${EPREFIX}/$(python_get_sitedir)/Twisted-${PV}-py${PYTHON_ABI}.egg-info"
}
python_execute_function create_twisted_egg-info
ok to commit? or will anybody else fix it?
it's broken, so fix it. (In reply to comment #3) > it's broken, so fix it. > your wish is my command - committed :) Nothing to do for Qt herd anymore, as far as I can see. we'll deal with wxpython later, need python itself first. |
For the following list of ebuilds, the majority has the python herd listed as maintainer. Where different, the maintainer is reported. The following list of ebuilds in gentoo-x86 have changes when compared to the Gentoo Prefix tree. Please review the changes and raise objections, if any. Thanks. --- setuptools/setuptools-0.6.8.ebuild 2009-11-21 04:38:01 +0100 +++ setuptools/setuptools-0.6.8.ebuild 2009-11-29 13:13:36 +0100 @@ -61 +61 @@ - rm -fr "${ROOT}"usr/lib*/python*/site-packages/{,._cfg????_}setuptools-*egg-info* || die "Deletion of broken files failed" + rm -fr "${EROOT}"usr/lib*/python*/site-packages/{,._cfg????_}setuptools-*egg-info* || die "Deletion of broken files failed" maintained by listed herds: python, qt --- sip/sip-4.9.2.ebuild 2009-11-20 16:04:40 +0100 +++ sip/sip-4.9.2.ebuild 2009-11-22 15:47:28 +0100 @@ -33 +33 @@ - --bindir=/usr/bin + --bindir=${EPREFIX}/usr/bin @@ -36 +36 @@ - --sipdir=/usr/share/sip + --sipdir=${EPREFIX}/usr/share/sip --- sphinx/sphinx-0.6.3.ebuild 2009-11-14 18:08:47 +0100 +++ sphinx/sphinx-0.6.3.ebuild 2009-11-22 15:47:29 +0100 @@ -65 +65 @@ - "$(PYTHON)" -c "from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${ROOT}$(python_get_sitedir)/sphinx/pycode/Grammar.txt')" \ + "$(PYTHON)" -c "from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${EROOT}$(python_get_sitedir)/sphinx/pycode/Grammar.txt')" \ @@ -75 +75 @@ - rm "${ROOT}$(python_get_sitedir)/sphinx/pycode"/Grammar*.pickle + rm "${EROOT}$(python_get_sitedir)/sphinx/pycode"/Grammar*.pickle --- twisted/twisted-8.2.0-r2.ebuild 2009-11-28 22:55:32 +0100 +++ twisted/twisted-8.2.0-r2.ebuild 2009-11-29 13:33:56 +0100 @@ -79 +79 @@ - rm -f "${D}/usr/$(get_libdir)"/python*/site-packages/twisted/plugins/dropin.cache + rm -f "${ED}/usr/$(get_libdir)"/python*/site-packages/twisted/plugins/dropin.cache @@ -95 +95 @@ - local tpath="${ROOT}$(python_get_sitedir)/twisted" + local tpath="${EROOT}$(python_get_sitedir)/twisted" --- wxpython/wxpython-2.8.10.1.ebuild 2009-10-26 19:35:38 +0100 +++ wxpython/wxpython-2.8.10.1.ebuild 2009-11-29 13:39:05 +0100 @@ -22,1 +22,1 @@ -IUSE="cairo doc examples opengl" +IUSE="aqua cairo doc examples opengl" @@ -29 +29 @@ - >=x11-libs/gtk+-2.4 + >=x11-libs/gtk+-2.4[aqua?] @@ -36 +36,2 @@ - opengl? ( >=dev-python/pyopengl-2.0.0.44 )" + opengl? ( >=dev-python/pyopengl-2.0.0.44 ) + aqua? ( >=dev-lang/python-2.6[aqua] )" @@ -76 +77,5 @@ - mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" + mypyconf="${mypyconf} UNICODE=1" + + use aqua \ + && mypyconf="${mypyconf} WXPORT=mac" \ + || mypyconf="${mypyconf} WXPORT=gtk2" @@ -94 +99,5 @@ - mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" + mypyconf="${mypyconf} UNICODE=1" + + use aqua \ + && mypyconf="${mypyconf} WXPORT=mac" \ + || mypyconf="${mypyconf} WXPORT=gtk2" @@ -97 +106 @@ - "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir) + "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib "${EPREFIX}"$(python_get_sitedir) @@ -102 +111 @@ - for file in "${D}"/usr/bin/*; do + for file in "${ED}"/usr/bin/*; do @@ -106 +115 @@ - for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do + for file in "${ED}$(python_get_sitedir)/"wx{version.*,.pth}; do @@ -122 +131 @@ - cp -R "${DOC_S}"/docs/* "${D}"usr/share/doc/${PF}/docs/ + cp -R "${DOC_S}"/docs/* "${ED}"usr/share/doc/${PF}/docs/ @@ -124 +133 @@ - cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${D}"usr/share/doc/${PF}/docs/ + cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${ED}"usr/share/doc/${PF}/docs/ @@ -130,2 +139,2 @@ - cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/ - cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/ + cp -R "${DOC_S}"/demo/* "${ED}"/usr/share/doc/${PF}/demo/ + cp -R "${DOC_S}"/samples/* "${ED}"/usr/share/doc/${PF}/samples/