From 0de8a2552ea63c8c2a43faf00086a0d0cf51f155 Mon Sep 17 00:00:00 2001 From: Simon Stelling Date: Wed, 7 Sep 2005 19:16:34 +0000 Subject: [PATCH] make multilib-strict aware; bug 103535 Package-Manager: portage-2.0.51.22-r2 --- dev-python/wxpython/ChangeLog | 7 ++++++- dev-python/wxpython/Manifest | 14 +++++++------- dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild | 11 ++++++----- dev-python/wxpython/wxpython-2.4.2.4.ebuild | 7 ++++--- dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild | 6 +++--- dev-python/wxpython/wxpython-2.6.1.0.ebuild | 6 +++--- 6 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog index 39356d0bd658..ba6f5f1fd699 100644 --- a/dev-python/wxpython/ChangeLog +++ b/dev-python/wxpython/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/wxpython # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.25 2005/07/12 18:48:03 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.26 2005/09/07 19:16:34 blubb Exp $ + + 07 Sep 2005; Simon Stelling wxpython-2.4.2.4.ebuild, + wxpython-2.4.2.4-r2.ebuild, wxpython-2.6.0.0-r1.ebuild, + wxpython-2.6.1.0.ebuild: + make multilib-strict aware; bug 103535 *wxpython-2.6.1.0 (12 Jul 2005) diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest index 18184e887b0a..c8dc84dcb357 100644 --- a/dev-python/wxpython/Manifest +++ b/dev-python/wxpython/Manifest @@ -1,14 +1,14 @@ +MD5 c1d1fd6b3081c0880bbbec2ab1e98f8f ChangeLog 10237 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182 -MD5 4244376f39c8e3a598d28c20115c235d wxpython-2.4.2.4.ebuild 2429 -MD5 a0fefedb3438a942e7a57236b61590f7 ChangeLog 10041 -MD5 45a3921cfa2a8e6822ac61840b0d77a9 wxpython-2.6.0.0-r1.ebuild 3830 -MD5 8b3de7660bdb72f5c7b3a5b9e6466cad wxpython-2.4.2.4-r2.ebuild 3837 -MD5 8d9a59c878ddfe516e596c4c282fb9c4 wxpython-2.6.1.0.ebuild 3786 +MD5 b0230600572787b85708285c7d907fa7 wxpython-2.4.2.4.ebuild 2470 +MD5 35a84d8b404fbd6bb1943b9b8ec8a5e4 wxpython-2.6.1.0.ebuild 3800 +MD5 febee19074c6fb2bb2b62843e9c40776 wxpython-2.4.2.4-r2.ebuild 3902 +MD5 90204c228ce41914368e3e67bb4aba81 wxpython-2.6.0.0-r1.ebuild 3844 +MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4 73 MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4-r2 73 MD5 28179f7df1afe227ca36d593ff6aab33 files/digest-wxpython-2.6.1.0 74 -MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404 -MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4 73 MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265 +MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404 MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373 MD5 a286125e4aefdde3f9adebd4f5ab6ff3 files/digest-wxpython-2.6.0.0-r1 74 MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.1.0.diff 3373 diff --git a/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild b/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild index c6df5bba17dd..ae8afa43a9ad 100644 --- a/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild +++ b/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild,v 1.7 2005/06/17 20:28:29 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild,v 1.8 2005/09/07 19:16:34 blubb Exp $ -inherit eutils wxwidgets python +inherit eutils wxwidgets python multilib MY_P="${P/wxpython-/wxPythonSrc-}" S="${WORKDIR}/${MY_P}/wxPython" @@ -69,7 +69,7 @@ src_install() { local mypyconf local dest local wx_name - local site_pkgs=/usr/lib/python${PYVER}/site-packages + local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages use opengl \ && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ @@ -79,7 +79,8 @@ src_install() { || mypyconf="${mypyconf} WXPORT=gtk" use unicode && mypyconf="${mypyconf} UNICODE=1" - python setup.py ${mypyconf} install --prefix=/usr --root=${D} || die + python setup.py ${mypyconf} install --prefix=/usr \ + --install-lib=/usr/$(get_libdir)/ --root=${D} || die # This can all be removed when 2.4.3 is released: # Future: Make sure we don't clobber existing wxversion.py or wx.pth @@ -123,7 +124,7 @@ pkg_postinst() { pkg_postrm() { python_version - site_pkgs=/usr/lib/python${PYVER}/site-packages + site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages cd ${site_pkgs} #If 2.4 is removed, set 2.6 as default version: for wxver in "wx-2.6-gtk2-unicode" "wx-2.6-gtk2-ansi" "wx-2.6-gtk" diff --git a/dev-python/wxpython/wxpython-2.4.2.4.ebuild b/dev-python/wxpython/wxpython-2.4.2.4.ebuild index 7602f9e4fca9..a37523cd4366 100644 --- a/dev-python/wxpython/wxpython-2.4.2.4.ebuild +++ b/dev-python/wxpython/wxpython-2.4.2.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4.ebuild,v 1.10 2005/01/26 03:24:40 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4.ebuild,v 1.11 2005/09/07 19:16:34 blubb Exp $ -inherit eutils wxwidgets +inherit eutils wxwidgets multilib MY_P="${P/wxpython-/wxPythonSrc-}" S="${WORKDIR}/${MY_P}/wxPython" @@ -81,5 +81,6 @@ src_install() { use unicode && mypyconf="${mypyconf} UNICODE=1" - python setup.py ${mypyconf} install --prefix=/usr --root=${D} || die + python setup.py ${mypyconf} install --prefix=/usr \ + --install-lib=/usr/$(get_libdir)/ --root=${D} || die } diff --git a/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild b/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild index 2c358eac8e62..f8a4037fcc16 100644 --- a/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild +++ b/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild,v 1.1 2005/05/11 20:08:38 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild,v 1.2 2005/09/07 19:16:34 blubb Exp $ -inherit python wxwidgets eutils +inherit python wxwidgets eutils multilib MY_P="${P/wxpython-/wxPython-src-}" DESCRIPTION="A blending of the wxWindows C++ class library with Python" @@ -79,7 +79,7 @@ src_compile() { src_install() { python_version local mypyconf - local site_pkgs=/usr/lib/python${PYVER}/site-packages + local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages dodir ${site_pkgs} if ! use gtk2; then diff --git a/dev-python/wxpython/wxpython-2.6.1.0.ebuild b/dev-python/wxpython/wxpython-2.6.1.0.ebuild index c41f00e590bd..f783d395e249 100644 --- a/dev-python/wxpython/wxpython-2.6.1.0.ebuild +++ b/dev-python/wxpython/wxpython-2.6.1.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.1.0.ebuild,v 1.1 2005/07/12 18:48:03 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.1.0.ebuild,v 1.2 2005/09/07 19:16:34 blubb Exp $ -inherit python wxwidgets eutils +inherit python wxwidgets eutils multilib MY_P="${P/wxpython-/wxPython-src-}" DESCRIPTION="A blending of the wxWindows C++ class library with Python" @@ -79,7 +79,7 @@ src_compile() { src_install() { python_version local mypyconf - local site_pkgs=/usr/lib/python${PYVER}/site-packages + local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages dodir ${site_pkgs} if ! use gtk2; then -- 2.26.2