diff options
| -rw-r--r-- | dev-python/pmw/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch | 17 | ||||
| -rw-r--r-- | dev-python/pmw/pmw-1.3.3-r2.ebuild (renamed from dev-python/pmw/pmw-1.3.3-r1.ebuild) | 38 | ||||
| -rw-r--r-- | dev-python/pmw/pmw-2.0.0-r2.ebuild (renamed from dev-python/pmw/pmw-2.0.0-r1.ebuild) | 10 |
4 files changed, 47 insertions, 28 deletions
diff --git a/dev-python/pmw/ChangeLog b/dev-python/pmw/ChangeLog index 916cb48f0f1c..f177126a6410 100644 --- a/dev-python/pmw/ChangeLog +++ b/dev-python/pmw/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-python/pmw # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/ChangeLog,v 1.41 2013/09/23 12:04:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/ChangeLog,v 1.42 2013/09/23 12:21:14 jlec Exp $ + +*pmw-2.0.0-r2 (23 Sep 2013) +*pmw-1.3.3-r2 (23 Sep 2013) + + 23 Sep 2013; Justin Lecher <jlec@gentoo.org> -pmw-1.3.3-r1.ebuild, + +pmw-1.3.3-r2.ebuild, -pmw-2.0.0-r1.ebuild, +pmw-2.0.0-r2.ebuild, + +files/pmw-1.3.3-install-no-docs.patch: + Fix patch and more pyton eclass funtion uses *pmw-2.0.0-r1 (23 Sep 2013) *pmw-1.3.3-r1 (23 Sep 2013) diff --git a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch new file mode 100644 index 000000000000..979e24abf59a --- /dev/null +++ b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch @@ -0,0 +1,17 @@ + src/setup.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/setup.py b/src/setup.py +index a5f9039..cfcf8a2 100755 +--- a/src/setup.py ++++ b/src/setup.py +@@ -16,9 +16,7 @@ setup(name="Pmw", + 'Pmw.Pmw_1_3_3.lib',], + + package_data={'Pmw': ['Pmw_1_3_3/lib/Pmw.def', +- 'Pmw_1_3_3/doc/*', + 'Pmw_1_3_3/contrib/*', +- 'Pmw_1_3_3/demos/*', + 'Pmw_1_3_3/tests/*', + 'Pmw_1_3_3/bin/*', + ] diff --git a/dev-python/pmw/pmw-1.3.3-r1.ebuild b/dev-python/pmw/pmw-1.3.3-r2.ebuild index cb05ee63a144..faa3abe99b01 100644 --- a/dev-python/pmw/pmw-1.3.3-r1.ebuild +++ b/dev-python/pmw/pmw-1.3.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.3.3-r1.ebuild,v 1.1 2013/09/23 12:04:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.3.3-r2.ebuild,v 1.1 2013/09/23 12:21:14 jlec Exp $ EAPI=5 @@ -26,38 +26,32 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/src" DOCS="Pmw/README" -# https://sourceforge.net/tracker/?func=detail&aid=3603487&group_id=10743&atid=110743 +# http://sourceforge.net/p/pmw/bugs/39/ RESTRICT="test" -python_prepare_all() { - local PATCHES=( - "${FILESDIR}"/${PN}-1.3.2-install-no-docs.patch - "${FILESDIR}"/1.3.2-python2.5.patch - ) - distutils-r1_python_prepare_all +PATCHES=( "${FILESDIR}"/${P}-install-no-docs.patch ) + +python_test() { + cd "${BUILD_DIR}/lib/Pmw/Pmw_1_3_3/" || die + PYTHONPATH=PYTHONPATH=tests:../../ + cp tests/{flagup.bmp,earthris.gif} . || die + for test in tests/*_test.py; do + echo "running test "$test + PYTHONPATH=tests:../../ "${PYTHON}" $test || die + done } python_install_all() { local DIR="Pmw/Pmw_1_3_3" if use doc; then - dohtml -a html,gif,py "${DIR}"/doc/* + dohtml -a html,gif,py ${DIR}/doc/* fi if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins "${DIR}"/demos/* + insinto /usr/share/doc/${PF}/examples + doins ${DIR}/demos/* fi - distutils-r1_python_install -} - -python_test() { - cd "${BUILD_DIR}/lib/Pmw/Pmw_1_3_3/" || die - PYTHONPATH=PYTHONPATH=tests:../../ - cp tests/{flagup.bmp,earthris.gif} . || die - for test in tests/*_test.py; do - echo "running test "$test - PYTHONPATH=tests:../../ "${PYTHON}" $test - done + distutils-r1_python_install_all } diff --git a/dev-python/pmw/pmw-2.0.0-r1.ebuild b/dev-python/pmw/pmw-2.0.0-r2.ebuild index f952d9676c02..cbf70e58ad63 100644 --- a/dev-python/pmw/pmw-2.0.0-r1.ebuild +++ b/dev-python/pmw/pmw-2.0.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-2.0.0-r1.ebuild,v 1.1 2013/09/23 12:04:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-2.0.0-r2.ebuild,v 1.1 2013/09/23 12:21:14 jlec Exp $ EAPI=5 @@ -22,15 +22,15 @@ IUSE="doc examples test" DEPEND="!dev-python/pmw:0" RDEPEND="${DEPEND}" -# https://sourceforge.net/tracker/?func=detail&aid=3603487&group_id=10743&atid=110743 +# http://sourceforge.net/p/pmw/bugs/39/ RESTRICT="test" S="${WORKDIR}/src" DOCS="Pmw/README" -src_prepare() { - distutils-r1_src_prepare +python_prepare() { + distutils-r1_python_prepare 2to3 Pmw } @@ -40,7 +40,7 @@ python_test() { cp tests/{flagup.bmp,earthris.gif} . || die for test in tests/*_test.py; do echo "running test "$test - PYTHONPATH=tests:../../ "${PYTHON}" $test + PYTHONPATH=tests:../../ "${PYTHON}" $test || die done } |