Version bump. Now SLOT'd

(Portage version: 2.0.51.20-r5)

9 files changed, 270 insertions, 74 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 6916ad08b511..7a5611cc94f5 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,15 @@
 # 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.16 2005/01/26 03:24:40 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.17 2005/05/02 18:29:01 pythonhead Exp $
+
+*wxpython-2.6.0.0 (02 May 2005)
+*wxpython-2.4.2.4-r2 (02 May 2005)
+
+  02 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/scripts-multiver-2.6.0.0.diff, files/wxpy-config.py,
+  +wxpython-2.4.2.4-r2.ebuild, -wxpython-2.5.3.1.ebuild,
+  +wxpython-2.6.0.0.ebuild:
+  Version bump. Now using SLOTs
 
   25 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
   wxpython-2.4.2.4.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 286ff430586c..5bb0880f4b7b 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
 MD5 4244376f39c8e3a598d28c20115c235d wxpython-2.4.2.4.ebuild 2429
-MD5 73c3f065e90b500d53bf3c2059516c5c wxpython-2.5.3.1.ebuild 3395
-MD5 eb2a54d7bf1d45ef05b22c7f6d7c3d55 ChangeLog 8852
-MD5 adcd9bb8ba7589a9509d8c17044c7989 wxpython-2.4.2.4-r1.ebuild 3565
-MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4-r1 73
-MD5 83d82d05e77457e559cf175012f538e7 files/digest-wxpython-2.5.3.1 74
+MD5 454c0e9fce3c6b87e863563fc74887af wxpython-2.6.0.0.ebuild 3731
+MD5 0b567ba579d0cab965a41f1bd370415f ChangeLog 9153
+MD5 db1d677158f75dc796862f8f44b4276a wxpython-2.4.2.4-r2.ebuild 3848
+MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4-r2 73
+MD5 a286125e4aefdde3f9adebd4f5ab6ff3 files/digest-wxpython-2.6.0.0 74
 MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404
 MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4 73
-MD5 960f9cf74312ac4829b96c63739fcfe9 files/wxpy-config.py 3275
+MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265
+MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFB9w2mz2gxt1z4IGYRAtdoAJ4wJ9B9Wg9SUCBFie4BCp4QnqdTQQCgxFAH
-2msZYBQ67FbX3o/qoeW1stQ=
-=Be4m
+iD8DBQFCdnFmz2gxt1z4IGYRAnqVAJ440IW/mYUkIKlGV/AKutcC2aGNJACfTApu
+xqXWSG3lsYZXZ6bhXAOuuiM=
+=EnIh
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r1 b/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r2
index a2e3b4a3aac2..a2e3b4a3aac2 100644
--- a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r1
+++ b/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r2
diff --git a/dev-python/wxpython/files/digest-wxpython-2.5.3.1 b/dev-python/wxpython/files/digest-wxpython-2.5.3.1
deleted file mode 100644
index c27f171ba09b..000000000000
--- a/dev-python/wxpython/files/digest-wxpython-2.5.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e3ed31f756a93f2d53725c4e0a18ba9 wxPython-src-2.5.3.1.tar.gz 15906505
diff --git a/dev-python/wxpython/files/digest-wxpython-2.6.0.0 b/dev-python/wxpython/files/digest-wxpython-2.6.0.0
new file mode 100644
index 000000000000..2433c94af3eb
--- /dev/null
+++ b/dev-python/wxpython/files/digest-wxpython-2.6.0.0
@@ -0,0 +1 @@
+MD5 6cb6517546e983e3d730708e0de0ed10 wxPython-src-2.6.0.0.tar.gz 18372673
diff --git a/dev-python/wxpython/files/scripts-multiver-2.6.0.0.diff b/dev-python/wxpython/files/scripts-multiver-2.6.0.0.diff
new file mode 100644
index 000000000000..24586a60eafa
--- /dev/null
+++ b/dev-python/wxpython/files/scripts-multiver-2.6.0.0.diff
@@ -0,0 +1,147 @@
+diff -cr scripts/helpviewer scripts.mine/helpviewer
+*** scripts/helpviewer	Wed Nov 12 21:03:49 2003
+--- scripts.mine/helpviewer	Wed Apr 27 04:07:31 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.helpviewer import main
+  main()
+diff -cr scripts/img2png scripts.mine/img2png
+*** scripts/img2png	Wed Nov 12 21:03:49 2003
+--- scripts.mine/img2png	Wed Apr 27 04:07:04 2005
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.img2png import main
+  main()
+  
+diff -cr scripts/img2py scripts.mine/img2py
+*** scripts/img2py	Wed Nov 12 21:03:49 2003
+--- scripts.mine/img2py	Wed Apr 27 04:07:36 2005
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  import sys
+  from wx.tools.img2py import main
+  main(sys.argv[1:])
+diff -cr scripts/img2xpm scripts.mine/img2xpm
+*** scripts/img2xpm	Wed Nov 12 21:03:49 2003
+--- scripts.mine/img2xpm	Wed Apr 27 04:07:14 2005
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.img2xpm import main
+  main()
+  
+diff -cr scripts/pyalacarte scripts.mine/pyalacarte
+*** scripts/pyalacarte	Wed Jul  2 23:12:38 2003
+--- scripts.mine/pyalacarte	Wed Apr 27 04:07:40 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyAlaCarte import main
+  main()
+diff -cr scripts/pyalamode scripts.mine/pyalamode
+*** scripts/pyalamode	Wed Jul  2 23:12:37 2003
+--- scripts.mine/pyalamode	Wed Apr 27 04:07:21 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyAlaMode import main
+  main()
+diff -cr scripts/pycrust scripts.mine/pycrust
+*** scripts/pycrust	Wed Jul  2 23:12:37 2003
+--- scripts.mine/pycrust	Wed Apr 27 04:07:43 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyCrust import main
+  main()
+diff -cr scripts/pyshell scripts.mine/pyshell
+*** scripts/pyshell	Wed Jul  2 23:12:37 2003
+--- scripts.mine/pyshell	Wed Apr 27 04:07:25 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyShell import main
+  main()
+diff -cr scripts/pywrap scripts.mine/pywrap
+*** scripts/pywrap	Wed Jul  2 23:12:37 2003
+--- scripts.mine/pywrap	Wed Apr 27 04:07:46 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyWrap import main
+  main()
+diff -cr scripts/pywxrc scripts.mine/pywxrc
+*** scripts/pywxrc	Mon Oct  4 20:03:33 2004
+--- scripts.mine/pywxrc	Wed Apr 27 04:07:28 2005
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.pywxrc import main
+  main()
+  
+diff -cr scripts/xrced scripts.mine/xrced
+*** scripts/xrced	Wed Nov 12 21:03:49 2003
+--- scripts.mine/xrced	Wed Apr 27 04:07:49 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.XRCed.xrced import main
+  main()
diff --git a/dev-python/wxpython/files/wxpy-config.py b/dev-python/wxpython/files/wxpy-config.py
index 5dc424b8e8ac..1ea9fda72adb 100755
--- a/dev-python/wxpython/files/wxpy-config.py
+++ b/dev-python/wxpython/files/wxpy-config.py
@@ -13,17 +13,17 @@
 
  Examples:
 
-    wx-2.4.2-gtk2-ansi
-    wx-2.4.2-gtk2-unicode
-    wx-2.5.3-gtk
+    wx-2.4-gtk2-ansi
+    wx-2.4-gtk2-unicode
+    wx-2.6-gtk
 
  It is strongly suggested you use a 2.4* version as the system default
  because most stable wxPython applications are known to work with it.
- Applications that only work with 2.5* can use this code to
- select 2.5*
+ Applications that only work with 2.6* can use this code to
+ select 2.6*
 
      import wxversion
-     wxversion.select("2.5")
+     wxversion.select("2.6")
      import wx
 
  See this documentation for more info if you're a wxPython developer:
@@ -40,7 +40,7 @@ PYVER = sys.version[0:3]
 SITE_PKGS = "/usr/lib/python%s/site-packages" % PYVER
 
 ENCODINGS = ["gtk2-ansi", "gtk2-unicode", "gtk-ansi"]
-WX_VERSIONS = ["2.4.2", "2.5.3"]
+WX_VERSIONS = ["2.4", "2.6"]
 
 
 def versions_installed():
diff --git a/dev-python/wxpython/wxpython-2.4.2.4-r1.ebuild b/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild
index 0779e04095fb..ae890bec8774 100644
--- a/dev-python/wxpython/wxpython-2.4.2.4-r1.ebuild
+++ b/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.3 2005/01/26 03:24:40 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4-r2.ebuild,v 1.1 2005/05/02 18:29:01 pythonhead Exp $
 
 inherit eutils wxwidgets python
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
 LICENSE="wxWinLL-3"
 SLOT="2.4"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
-IUSE="gtk2 unicode opengl tiff jpeg png"
+IUSE="gtk gtk2 unicode opengl tiff jpeg png"
 
 RDEPEND=">=dev-lang/python-2.1
 	=x11-libs/wxGTK-2.4.2*
@@ -35,11 +35,7 @@ DEPEND="${RDEPEND}
 	gtk2? ( dev-util/pkgconfig )"
 
 pkg_setup() {
-	einfo "You can now have gtk, gtk2 and unicode versions of wxGTK"
-	einfo "simultaneously installed as of >=wxGTK-2.4.2-r2."
-	einfo "This means you can have wxpython installed using any one of those"
-	einfo "versions by setting gtk2, unicode, or -gtk2 (for gtk1) in USE"
-	if  use unicode; then
+	if use unicode; then
 		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
 	fi
 }
@@ -48,7 +44,7 @@ src_compile() {
 	local mypyconf
 
 	if ! use gtk2; then
-		need-wxwidgets gtk || die "Emerge wxGTK with -no_wxgtk1 in USE"
+		need-wxwidgets gtk || die "Emerge wxGTK with wxgtk1 in USE"
 	elif use unicode; then
 		need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
 	else
@@ -89,32 +85,52 @@ src_install() {
 	# Future: Make sure we don't clobber existing wxversion.py or wx.pth
 	# from SLOT'd versions.
 	if use unicode; then
-		wx_name=wx-${PV:0:5}-gtk2-unicode
+		wx_name=wx-${PV:0:3}-gtk2-unicode
 	elif use gtk2; then
-		wx_name=wx-${PV:0:5}-gtk2-ansi
+		wx_name=wx-${PV:0:3}-gtk2-ansi
 	else
-		wx_name=wx-${PV:0:5}-gtk-ansi
+		wx_name=wx-${PV:0:3}-gtk-ansi
 	fi
 	dest=${site_pkgs}/${wx_name}
 	dodir ${site_pkgs}
 	dodir ${dest}
 	mv ${D}/${site_pkgs}/wx ${D}/${dest}
 	mv ${D}/${site_pkgs}/wxPython ${D}/${dest}
-	if [ ! -e "${site_pkgs}/wx.pth" ]; then
-		echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \
-			die "Couldn't create wx.pth"
-		einfo "Setting ${wx_name} as system default wxPython"
-		echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \
-			die "Couldn't create wx.pth"
-	fi
-	if [ ! -e "${site_pkgs}/wxversion.py" ]; then
-		cp ${FILESDIR}/wxversion.py ${D}/${site_pkgs} || \
-			die "Couldn't copy wxversion.py"
-	fi
-	if [ ! -e "${site_pkgs}/wxpy-config.py" ]; then
-		dodir ${site_pkgs}
-		cp ${FILESDIR}/wxpy-config.py ${D}/${site_pkgs}/ || \
-			die "Couldn't copy wxpy-config.py"
-	fi
+
+	echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \
+		die "Couldn't create wx.pth"
+	einfo "Setting ${wx_name} as system default wxPython"
+	echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \
+		die "Couldn't create wx.pth"
+
+	cp ${FILESDIR}/wxversion.py ${D}/${site_pkgs} || \
+		die "Couldn't copy wxversion.py"
+	dodir ${site_pkgs}
+
+	cp ${FILESDIR}/wxpy-config.py ${D}/${site_pkgs}/ || \
+		die "Couldn't copy wxpy-config.py"
+}
+
+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"
 }
 
+pkg_postrm() {
+	python_version
+	site_pkgs=/usr/lib/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"
+	do
+		if [ -e "${wxver}" ]; then
+			echo "Setting ${wxver} as system default."
+			echo "${wxver}" > "wx.pth"
+		fi
+	done
+}
diff --git a/dev-python/wxpython/wxpython-2.5.3.1.ebuild b/dev-python/wxpython/wxpython-2.6.0.0.ebuild
index f81a06ba16af..a7851efc7427 100644
--- a/dev-python/wxpython/wxpython-2.5.3.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.0.0.ebuild
@@ -1,22 +1,21 @@
 # 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.5.3.1.ebuild,v 1.5 2005/01/26 03:24:40 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.0.0.ebuild,v 1.1 2005/05/02 18:29:01 pythonhead Exp $
 
-inherit python wxwidgets
+inherit python wxwidgets eutils
 
 MY_P="${P/wxpython-/wxPython-src-}"
-S="${WORKDIR}/${MY_P}/wxPython"
 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.5"
+SLOT="2.6"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa"
-IUSE="gtk2 unicode opengl tiff jpeg png"
+IUSE="gtk gtk2 unicode opengl tiff jpeg png"
 
 RDEPEND=">=dev-lang/python-2.1
-	=x11-libs/wxGTK-2.5.3*
+	=x11-libs/wxGTK-2.6*
 	!<dev-python/wxpython-2.4.2.4-r1
 	gtk2? ( >=x11-libs/gtk+-2.0
 		>=x11-libs/pango-1.2
@@ -30,17 +29,16 @@ RDEPEND=">=dev-lang/python-2.1
 	jpeg? ( media-libs/jpeg )
 	tiff? ( media-libs/tiff )
 	>=sys-libs/zlib-1.1.4
-	opengl? ( >=dev-python/pyopengl-2.0.0.44 )"
+	opengl? ( >=dev-python/pyopengl-2.0.0.44 )
+	!<dev-python/wxpython-2.4.2.4-r1"
 
 DEPEND="${RDEPEND}
 	gtk2? ( dev-util/pkgconfig )
 	sys-apps/sed"
 
+S="${WORKDIR}/${MY_P}/wxPython/"
+
 pkg_setup() {
-	einfo "You can now have gtk, gtk2 and unicode versions of wxGTK"
-	einfo "simultaneously installed as of >=wxGTK-2.4.2-r2."
-	einfo "This means you can have wxpython installed using any one of those"
-	einfo "versions by setting gtk2, unicode, or -gtk2 (for gtk1) in USE"
 	if  use unicode; then
 		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
 	fi
@@ -48,21 +46,23 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die
+	cd ${S} || die "failed to cd to ${S}"
+	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
+	epatch ${FILESDIR}/scripts-multiver-${PV}.diff
 }
 
 src_compile() {
 	local mypyconf
-	export WX_GTK_VER="2.5"
+	export WX_GTK_VER="2.6"
 	if ! use gtk2; then
-		need-wxwidgets gtk || die "Emerge wxGTK with -no_wxgtk1 in USE"
+		need-wxwidgets gtk
 	elif use unicode; then
-		need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
+		need-wxwidgets unicode
 	else
-		need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE"
+		need-wxwidgets gtk2
 	fi
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+
+	mypyconf="${mypyconf} MONOLITHIC=1 WX_CONFIG=${WX_CONFIG}"
 	use opengl \
 		&& 	mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
 		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
@@ -83,7 +83,7 @@ src_install() {
 	dodir ${site_pkgs}
 
 	if ! use gtk2; then
-		need-wxwidgets gtk || die "Emerge wxGTK with -no_wxgtk1 in USE"
+		need-wxwidgets gtk || die "Emerge wxGTK with wxgtk1 in USE"
 	elif use unicode; then
 		need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
 	else
@@ -103,16 +103,39 @@ src_install() {
 
 	python setup.py ${mypyconf} install --prefix=/usr --root=${D} || die
 
-	# Don't clobber existing versions from SLOT'd version
-	if [ -e "${site_pkgs}/wxversion.py" ]; then
-		rm ${D}/${site_pkgs}/wxversion.py
-	fi
-	if [ -e "${site_pkgs}/wx.pth" ]; then
+	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
+		elif use gtk2; then
+			wx_name=wx-${PV:0:3}-gtk2-ansi
+		else
+			wx_name=wx-${PV:0:3}-gtk-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
-	if [ ! -e "${site_pkgs}/wxpy-config.py" ]; then
-		cp ${FILESDIR}/wxpy-config.py ${D}/${site_pkgs}/ || \
-			die "Couldn't copy wxpy-config.py"
-	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"
 }