Bump to new upstream version 2.6.3.2; bug #121856

(Portage version: 2.1_pre7-r3)

4 files changed, 129 insertions, 12 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index c1248c47c32b..6d2fdfecdf9d 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.37 2006/02/09 00:21:58 tove Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.38 2006/04/13 18:50:12 halcy0n Exp $
+
+*wxpython-2.6.3.2 (13 Apr 2006)
+
+  13 Apr 2006; Mark Loeser <halcy0n@gentoo.org> +wxpython-2.6.3.2.ebuild:
+  Bump to new upstream version 2.6.3.2; bug #121856
 
   18 Dec 2005; Markus Rothe <corsair@gentoo.org> wxpython-2.6.1.0.ebuild:
   Stable on ppc64
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 37b8f75162e1..7b20fcd772ff 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c4bc4e06bd874c242ec17be6a110a54b ChangeLog 11302
 RMD160 22366db659355b950e484c5efd7c9e829d1cdb1b ChangeLog 11302
 SHA256 91f89198dbdf7a93f2902c4d81135467d46f8d6f512f97c83e4b580902d1998a ChangeLog 11302
@@ -16,6 +13,9 @@ SHA256 630a811eabfc6001cc47d311b379b6af254622b49d99501647e901e57802aa62 files/di
 MD5 28179f7df1afe227ca36d593ff6aab33 files/digest-wxpython-2.6.1.0 74
 RMD160 fb407d40e09183cb0743e46059fb678bf9a7cf5b files/digest-wxpython-2.6.1.0 74
 SHA256 dcf64efb92ec21ede1eddb6c6652635ac107cc70f890f9ab54ede9a131250210 files/digest-wxpython-2.6.1.0 74
+MD5 f154a877dfb1ee91361196176dcfaa5b files/digest-wxpython-2.6.3.2 268
+RMD160 50c151bcd8e0f1a42b9adddd13263e094f7fe958 files/digest-wxpython-2.6.3.2 268
+SHA256 ec01ef53b8d527a2c26c2b1d8bbd1a3657cca61292f23b16304d2bc0af48f1b9 files/digest-wxpython-2.6.3.2 268
 MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373
 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 files/scripts-multiver-2.6.0.0.diff 3373
 SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084 files/scripts-multiver-2.6.0.0.diff 3373
@@ -43,10 +43,6 @@ SHA256 dc0f56cf81568107b8d93b08049438e965803a3917f90a149b883dd71d16714f wxpython
 MD5 b7e08422f599125874b8a8b9e77139ef wxpython-2.6.1.0.ebuild 3799
 RMD160 21174a37b98de635cd51669362b1d072bf7e8fad wxpython-2.6.1.0.ebuild 3799
 SHA256 f126cc324972aa9bd5ff7e359153b46ca10bd472e8a954565d449e1baeab0a49 wxpython-2.6.1.0.ebuild 3799
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6osyV3J2n04EauwRAhbKAJsFP+aytGtlhuUwYE/rGdy5nvJlggCgoUaT
-A4IBG+tjSVjWqM4NCR2KjTQ=
-=m3Os
------END PGP SIGNATURE-----
+MD5 df5c56c31f2512b4d5060072a9e1702f wxpython-2.6.3.2.ebuild 3077
+RMD160 f7d4372f698f3b37f4de3749b48bb0e74575b0c2 wxpython-2.6.3.2.ebuild 3077
+SHA256 40d4b3d7a5b641151eec396d2aad928805c7f37df6a69cc48a251fc7234b25ce wxpython-2.6.3.2.ebuild 3077
diff --git a/dev-python/wxpython/files/digest-wxpython-2.6.3.2 b/dev-python/wxpython/files/digest-wxpython-2.6.3.2
new file mode 100644
index 000000000000..157d9c5d060c
--- /dev/null
+++ b/dev-python/wxpython/files/digest-wxpython-2.6.3.2
@@ -0,0 +1,3 @@
+MD5 a27546fab8a8d77eb6b67954e6362269 wxPython-src-2.6.3.2.tar.gz 18946956
+RMD160 4fabaefa4c066d1cccc5301bdd31cda16a55647b wxPython-src-2.6.3.2.tar.gz 18946956
+SHA256 21558bf3f306bb935b53e0ca42664ca325ec3cc4d9452b79bb5d9ff4b68aadb6 wxPython-src-2.6.3.2.tar.gz 18946956
diff --git a/dev-python/wxpython/wxpython-2.6.3.2.ebuild b/dev-python/wxpython/wxpython-2.6.3.2.ebuild
new file mode 100644
index 000000000000..1d7100c36fc6
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.6.3.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.2.ebuild,v 1.1 2006/04/13 18:50:12 halcy0n Exp $
+
+inherit python wxwidgets eutils multilib
+
+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.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="unicode opengl"
+
+RDEPEND=">=dev-lang/python-2.1
+	=x11-libs/wxGTK-2.6*
+	>=x11-libs/gtk+-2.0
+	>=x11-libs/pango-1.2
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	>=sys-libs/zlib-1.1.4
+	opengl? ( >=dev-python/pyopengl-2.0.0.44 )
+	!<dev-python/wxpython-2.4.2.4-r1"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/wxPython/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die "failed to cd to ${S}"
+	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
+	epatch ${FILESDIR}/scripts-multiver-2.6.1.0.diff
+}
+
+src_compile() {
+	local mypyconf
+	export WX_GTK_VER="2.6"
+	if use unicode; then
+		need-wxwidgets unicode || die "Please re-emerge wxGTK with unicode " \
+		"in USE"
+	else
+		need-wxwidgets gtk2
+	fi
+
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	use opengl \
+		&& 	mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	mypyconf="${mypyconf} WXPORT=gtk2"
+
+	use unicode && mypyconf="${mypyconf} UNICODE=1"
+
+	python setup.py ${mypyconf} build || die "build failed"
+}
+
+src_install() {
+	python_version
+	local mypyconf
+	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
+	dodir ${site_pkgs}
+
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	use opengl \
+		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	mypyconf="${mypyconf} WXPORT=gtk2"
+
+	use unicode && mypyconf="${mypyconf} UNICODE=1"
+
+	python setup.py ${mypyconf} install --prefix=/usr --root="${D}" || die
+
+	if [ -e "${site_pkgs}/wx.pth" ] && [ "`grep -o 2.4 ${site_pkgs}/wx.pth`" = "2.4" ]; then
+		rm "${D}"/${site_pkgs}/wx.pth
+		einfo "Keeping 2.4 as system default wxPython"
+	else
+		if use unicode; then
+			wx_name=wx-${PV:0:3}-gtk2-unicode
+		else
+			wx_name=wx-${PV:0:3}-gtk2-ansi
+		fi
+
+		einfo "Setting ${wx_name} as system default wxPython"
+		echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \
+			die "Couldn't create wx.pth"
+
+	fi
+
+	cp "${FILESDIR}"/wxpy-config.py "${D}"/${site_pkgs}/
+
+	#Add ${PV} suffix to all /usr/bin/* programs to avoid clobbering SLOT'd
+	for filename in "${D}"/usr/bin/* ; do
+		mv ${filename} ${filename}-2.6
+	done
+}
+
+pkg_postinst() {
+
+	einfo "Gentoo now uses the Multi-version method for SLOT'ing"
+	einfo "Developers see this site for instructions on using 2.4 or 2.6"
+	einfo "with your apps:"
+	einfo "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
+	einfo "2.4 is still the default wxpython for now, but 2.6 apps should"
+	einfo "see the above website for selecting the 2.6 lib"
+}
+