From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JcWUr-0002zD-4j for garchives@archives.gentoo.org; Fri, 21 Mar 2008 01:56:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1596BE03A3; Fri, 21 Mar 2008 01:56:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C2278E03A3 for ; Fri, 21 Mar 2008 01:56:39 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 440C76716F for ; Fri, 21 Mar 2008 01:56:39 +0000 (UTC) Received: from dirtyepic by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JcWUo-0005wC-8h for gentoo-commits@lists.gentoo.org; Fri, 21 Mar 2008 01:56:38 +0000 From: "Ryan Hill (dirtyepic)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dirtyepic@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-python/wxpython: wxpython-2.6.4.0-r1.ebuild ChangeLog wxpython-2.8.7.1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: wxpython-2.6.4.0-r1.ebuild ChangeLog wxpython-2.8.7.1.ebuild X-VCS-Directories: dev-python/wxpython X-VCS-Committer: dirtyepic X-VCS-Committer-Name: Ryan Hill Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ryan Hill Date: Fri, 21 Mar 2008 01:56:38 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7e912f56-0696-425e-9249-f8fafef27004 X-Archives-Hash: dfa1aaed8bc8f09fc01ffaf749d0bdf1 dirtyepic 08/03/21 01:56:38 Modified: wxpython-2.6.4.0-r1.ebuild ChangeLog wxpython-2.8.7.1.ebuild Log: Move wxaddons module into version-specific directories to fix bug #2138= 19. (Portage version: 2.1.4.4) Revision Changes Path 1.13 dev-python/wxpython/wxpython-2.6.4.0-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/wxpython-2.6.4.0-r1.ebuild?rev=3D1.13&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/wxpython-2.6.4.0-r1.ebuild?rev=3D1.13&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/wxpython-2.6.4.0-r1.ebuild?r1=3D1.12&r2=3D1.13 Index: wxpython-2.6.4.0-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r1= .ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- wxpython-2.6.4.0-r1.ebuild 17 Mar 2008 12:39:39 -0000 1.12 +++ wxpython-2.6.4.0-r1.ebuild 21 Mar 2008 01:56:37 -0000 1.13 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-= r1.ebuild,v 1.12 2008/03/17 12:39:39 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-= r1.ebuild,v 1.13 2008/03/21 01:56:37 dirtyepic Exp $ =20 EAPI=3D1 =20 @@ -87,9 +87,18 @@ --install-purelib ${site_pkgs} || die "setup.py install failed" =20 # Collision protection. - for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth,addo= ns}; do + for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth}; do mv "${file}" "${file}-${SLOT}" done + + for dir in "${D}"/${site_pkgs}/wx-${SLOT}-gtk2-{ansi,unicode}; do + if [[ -d ${dir} ]]; then + cp -R "${D}"/${site_pkgs}/wxaddons/ ${dir} + wxaddons_copied=3D1 + fi + done + + [[ ${wxaddons_copied} ]] && rm -rf "${D}"/${site_pkgs}/wxaddons/ } =20 pkg_postinst() { 1.87 dev-python/wxpython/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/ChangeLog?rev=3D1.87&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/ChangeLog?rev=3D1.87&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/ChangeLog?r1=3D1.86&r2=3D1.87 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- ChangeLog 17 Mar 2008 12:39:39 -0000 1.86 +++ ChangeLog 21 Mar 2008 01:56:37 -0000 1.87 @@ -1,6 +1,10 @@ # ChangeLog for dev-python/wxpython # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.86 = 2008/03/17 12:39:39 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.87 = 2008/03/21 01:56:37 dirtyepic Exp $ + + 21 Mar 2008; Ryan Hill wxpython-2.6.4.0-r1.ebui= ld, + wxpython-2.8.7.1.ebuild: + Move wxaddons module into version-specific directories to fix bug #213= 819. =20 17 Mar 2008; Peter Volkov wxpython-2.6.4.0-r1.ebuild, wxpython-2.8.7.1.ebuild: 1.10 dev-python/wxpython/wxpython-2.8.7.1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/wxpython-2.8.7.1.ebuild?rev=3D1.10&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/wxpython-2.8.7.1.ebuild?rev=3D1.10&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/wxpytho= n/wxpython-2.8.7.1.ebuild?r1=3D1.9&r2=3D1.10 Index: wxpython-2.8.7.1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.7.1.eb= uild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wxpython-2.8.7.1.ebuild 17 Mar 2008 12:39:39 -0000 1.9 +++ wxpython-2.8.7.1.ebuild 21 Mar 2008 01:56:37 -0000 1.10 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.7.1.= ebuild,v 1.9 2008/03/17 12:39:39 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.7.1.= ebuild,v 1.10 2008/03/21 01:56:37 dirtyepic Exp $ =20 EAPI=3D"1" WX_GTK_VER=3D"2.8" @@ -76,9 +76,18 @@ --install-purelib ${site_pkgs} || die "setup.py install failed" =20 # Collision protection. - for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth,addo= ns}; do + for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth}; do mv "${file}" "${file}-${SLOT}" done + + for dir in "${D}"/${site_pkgs}/wx-${SLOT}-gtk2-{ansi,unicode}; do + if [[ -d ${dir} ]]; then + cp -R "${D}"/${site_pkgs}/wxaddons/ ${dir} + wxaddons_copied=3D1 + fi + done + + [[ ${wxaddons_copied} ]] && rm -rf "${D}"/${site_pkgs}/wxaddons/ } =20 pkg_postinst() { --=20 gentoo-commits@lists.gentoo.org mailing list