From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D202C1381F3 for ; Wed, 23 Oct 2013 10:46:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8FCDE09ED; Wed, 23 Oct 2013 10:46:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EB63E09ED for ; Wed, 23 Oct 2013 10:46:11 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3CA333F236 for ; Wed, 23 Oct 2013 10:46:09 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 0CD582004C; Wed, 23 Oct 2013 10:46:07 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-python/wxpython: wxpython-2.9.4.1-r2.ebuild wxpython-2.8.12.1-r2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: wxpython-2.9.4.1-r2.ebuild wxpython-2.8.12.1-r2.ebuild ChangeLog X-VCS-Directories: dev-python/wxpython X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20131023104608.0CD582004C@flycatcher.gentoo.org> Date: Wed, 23 Oct 2013 10:46:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 177ac143-56c8-4233-8443-87c06bdc9098 X-Archives-Hash: a99a4614e17a8ec4fcb50abc01e96f66 mgorny 13/10/23 10:46:07 Modified: ChangeLog Added: wxpython-2.9.4.1-r2.ebuild wxpython-2.8.12.1-r2.ebuild Log: Support python-exec:2. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision Changes Path 1.192 dev-python/wxpython/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.192&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.192&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/ChangeLog?r1=1.191&r2=1.192 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- ChangeLog 6 Oct 2013 09:01:39 -0000 1.191 +++ ChangeLog 23 Oct 2013 10:46:07 -0000 1.192 @@ -1,6 +1,13 @@ # ChangeLog for dev-python/wxpython # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.191 2013/10/06 09:01:39 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.192 2013/10/23 10:46:07 mgorny Exp $ + +*wxpython-2.9.4.1-r2 (23 Oct 2013) +*wxpython-2.8.12.1-r2 (23 Oct 2013) + + 23 Oct 2013; Michał Górny +wxpython-2.8.12.1-r2.ebuild, + +wxpython-2.9.4.1-r2.ebuild: + Support python-exec:2. 06 Oct 2013; Ryan Hill wxpython-2.8.12.1.ebuild: Drop to ~sh. 1.1 dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild?rev=1.1&content-type=text/plain Index: wxpython-2.9.4.1-r2.ebuild =================================================================== # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild,v 1.1 2013/10/23 10:46:07 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) WX_GTK_VER="2.9" inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets MY_PN="wxPython-src" DESCRIPTION="A blending of the wxWindows C++ class library with Python" HOMEPAGE="http://www.wxpython.org/" SRC_URI="mirror://sourceforge/wxpython/${MY_PN}-2.9.4.0.tar.bz2 examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.9.4.0.tar.bz2 ) mirror://sourceforge/wxpython/${MY_PN}-2.9.4.1.patch" LICENSE="wxWinLL-3" SLOT="2.9" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="cairo examples opengl" RDEPEND=" dev-python/python-exec:2[${PYTHON_USEDEP}] >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[${PYTHON_USEDEP}] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" S="${WORKDIR}/${MY_PN}-2.9.4.0/wxPython" DOC_S="${WORKDIR}/wxPython-2.9.4.0" # The hacky build system seems to be broken with out-of-source builds, # and installs 'wx' package globally. DISTUTILS_IN_SOURCE_BUILD=1 python_prepare_all() { sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" cd .. || die epatch "${DISTDIR}"/${MY_PN}-${PV}.patch if use examples; then cd "${DOC_S}" epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch fi cd "${S}" || die local PATCHES=( "${FILESDIR}"/${P}-wxversion-scripts.patch # drop editra - we have it as a separate package now "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch # fix handling egg_info command "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch ) distutils-r1_python_prepare_all } src_configure() { append-flags -fno-strict-aliasing need-wxwidgets unicode mydistutilsargs=( WX_CONFIG="${WX_CONFIG}" WXPORT=gtk2 UNICODE=1 BUILD_GLCANVAS=$(usex opengl 1 0) ) } python_compile() { # We need to have separate libdirs due to hackery, bug #455332. distutils-r1_python_compile \ build --build-purelib "${BUILD_DIR}"/lib.common } python_install() { distutils-r1_python_install \ build --build-purelib "${BUILD_DIR}"/lib.common # adjust the filenames for wxPython slots. local file for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do mv "${file}" "${file}-${SLOT}" || die done cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die for file in *; do mv "${file}" "${file}-${SLOT}" || die # wrappers are common to all impls, so a parallel run may # move it for us. ln+rm is more failure-proof. ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die rm -f "${ED}usr/bin/${file}" done } python_install_all() { dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt for x in {Py{AlaMode,Crust,Shell},XRCed}; do newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop done newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png newicon wx/py/PySlices_32.png PySlices-${SLOT}.png newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png if use examples; then docinto demo dodoc -r "${DOC_S}"/demo/. docinto samples dodoc -r "${DOC_S}"/samples/. [[ -e ${docdir}/samples/embedded/embedded ]] \ && rm -f "${docdir}"/samples/embedded/embedded docompress -x /usr/share/doc/${PF}/{demo,samples} fi } pkg_postinst() { fdo-mime_desktop_database_update create_symlinks() { alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" } python_foreach_impl create_symlinks echo elog "Gentoo uses the Multi-version method for SLOT'ing." elog "Developers, see this site for instructions on using" elog "2.8 or 2.9 with your apps:" elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" if use examples; then elog elog "The demo.py app which contains demo modules with" elog "documentation and source code has been installed at" elog "/usr/share/doc/${PF}/demo/demo.py" elog elog "More example apps and modules can be found in" elog "/usr/share/doc/${PF}/samples/" fi } pkg_postrm() { fdo-mime_desktop_database_update update_symlinks() { alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" } python_foreach_impl update_symlinks } 1.1 dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild?rev=1.1&content-type=text/plain Index: wxpython-2.8.12.1-r2.ebuild =================================================================== # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild,v 1.1 2013/10/23 10:46:07 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) WX_GTK_VER="2.8" inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets MY_P="${P/wxpython-/wxPython-src-}" DESCRIPTION="A blending of the wxWindows C++ class library with Python" HOMEPAGE="http://www.wxpython.org/" SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" LICENSE="wxWinLL-3" SLOT="2.8" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="cairo doc examples opengl" RDEPEND=" dev-python/python-exec:2[${PYTHON_USEDEP}] >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[${PYTHON_USEDEP}] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig" S="${WORKDIR}/${MY_P}/wxPython" DOC_S="${WORKDIR}/wxPython-${PV}" # The hacky build system seems to be broken with out-of-source builds, # and installs 'wx' package globally. DISTUTILS_IN_SOURCE_BUILD=1 python_prepare_all() { sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" if use doc; then cd "${DOC_S}" || die epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch fi if use examples; then cd "${DOC_S}" || die epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch fi cd "${S}" || die local PATCHES=( "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch # drop editra - we have it as a separate package now "${FILESDIR}"/${PN}-2.8.12-drop-editra.patch "${FILESDIR}"/${PN}-2.8.12-drop-categories.patch "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch # fix handling egg_info command "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch ) distutils-r1_python_prepare_all } python_configure_all() { append-flags -fno-strict-aliasing # Workaround, buildsystem uses CFLAGS as CXXFLAGS export CFLAGS="${CXXFLAGS}" need-wxwidgets unicode mydistutilsargs=( WX_CONFIG="${WX_CONFIG}" WXPORT=gtk2 UNICODE=1 BUILD_GLCANVAS=$(usex opengl 1 0) ) } python_compile() { # We need to have separate libdirs due to hackery, bug #455332. distutils-r1_python_compile \ build --build-purelib "${BUILD_DIR}"/lib.common } python_install() { distutils-r1_python_install \ build --build-purelib "${BUILD_DIR}"/lib.common # adjust the filenames for wxPython slots. local file for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do mv "${file}" "${file}-${SLOT}" || die done cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die for file in *; do mv "${file}" "${file}-${SLOT}" || die # wrappers are common to all impls, so a parallel run may # move it for us. ln+rm is more failure-proof. ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die rm -f "${ED}usr/bin/${file}" done } python_install_all() { dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt domenu distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop newicon wx/py/PyCrust_32.png PyCrust.png newicon wx/tools/XRCed/XRCed_32.png XRCed.png docdir=${D}usr/share/doc/${PF} if use doc; then docinto docs dodoc -r "${DOC_S}"/docs/. # For some reason newer API docs aren't available so use 2.8.9.2's dodoc -r "${WORKDIR}"/wxPython-2.8.9.2/docs/. docompress -x /usr/share/doc/${PF}/docs fi if use examples; then docinto demo dodoc -r "${DOC_S}"/demo/. docinto samples dodoc -r "${DOC_S}"/samples/. [[ -e ${docdir}/samples/embedded/embedded ]] \ && rm -f "${docdir}"/samples/embedded/embedded docompress -x /usr/share/doc/${PF}/{demo,samples} fi } pkg_postinst() { fdo-mime_desktop_database_update create_symlinks() { alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" } python_foreach_impl create_symlinks echo elog "Gentoo uses the Multi-version method for SLOT'ing." elog "Developers, see this site for instructions on using" elog "2.6 or 2.8 with your apps:" elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" if use doc; then elog elog "To access the general wxWidgets documentation, run" elog "/usr/share/doc/${PF}/docs/viewdocs.py" elog elog "wxPython documentation is available by pointing a browser" elog "at /usr/share/doc/${PF}/docs/api/index.html" fi if use examples; then elog elog "The demo.py app which contains hundreds of demo modules" elog "with documentation and source code has been installed at" elog "/usr/share/doc/${PF}/demo/demo.py" elog elog "Many more example apps and modules can be found in" elog "/usr/share/doc/${PF}/samples/" fi elog elog "Editra is not packaged with wxpython in Gentoo." elog "You can find it in the tree as app-editors/editra" } pkg_postrm() { fdo-mime_desktop_database_update update_symlinks() { alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" } python_foreach_impl update_symlinks }