Version bump.

(Portage version: 2.0.51.22-r1)

5 files changed, 305 insertions, 7 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 5434ed189dc8..39356d0bd658 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2005/06/17 20:28:29 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.25 2005/07/12 18:48:03 pythonhead Exp $
+
+*wxpython-2.6.1.0 (12 Jul 2005)
+
+  12 Jul 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/scripts-multiver-2.6.1.0.diff, +wxpython-2.6.1.0.ebuild:
+  Version bump.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   wxpython-2.4.2.4-r2.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index cc77f4b04026..8fa95e465682 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,11 +1,14 @@
-MD5 45a3921cfa2a8e6822ac61840b0d77a9 wxpython-2.6.0.0-r1.ebuild 3830
-MD5 8b3de7660bdb72f5c7b3a5b9e6466cad wxpython-2.4.2.4-r2.ebuild 3837
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
-MD5 1a50d2507a42438ddb199904e6b8ff15 ChangeLog 9868
 MD5 4244376f39c8e3a598d28c20115c235d wxpython-2.4.2.4.ebuild 2429
+MD5 c0cbb0e30fb15aab33a8f36768cf8bf0 ChangeLog 10037
+MD5 45a3921cfa2a8e6822ac61840b0d77a9 wxpython-2.6.0.0-r1.ebuild 3830
+MD5 8b3de7660bdb72f5c7b3a5b9e6466cad wxpython-2.4.2.4-r2.ebuild 3837
+MD5 e4b34b5c486c0f2ca4a15aef8f30f34f wxpython-2.6.1.0.ebuild 3786
 MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4-r2 73
-MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265
-MD5 a286125e4aefdde3f9adebd4f5ab6ff3 files/digest-wxpython-2.6.0.0-r1 74
+MD5 28179f7df1afe227ca36d593ff6aab33 files/digest-wxpython-2.6.1.0 74
 MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404
-MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373
 MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4 73
+MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265
+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/files/digest-wxpython-2.6.1.0 b/dev-python/wxpython/files/digest-wxpython-2.6.1.0
new file mode 100644
index 000000000000..18614d21bfca
--- /dev/null
+++ b/dev-python/wxpython/files/digest-wxpython-2.6.1.0
@@ -0,0 +1 @@
+MD5 3408f80ef091cfb8a46be4ed70fb0475 wxPython-src-2.6.1.0.tar.gz 18452406
diff --git a/dev-python/wxpython/files/scripts-multiver-2.6.1.0.diff b/dev-python/wxpython/files/scripts-multiver-2.6.1.0.diff
new file mode 100644
index 000000000000..24586a60eafa
--- /dev/null
+++ b/dev-python/wxpython/files/scripts-multiver-2.6.1.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/wxpython-2.6.1.0.ebuild b/dev-python/wxpython/wxpython-2.6.1.0.ebuild
new file mode 100644
index 000000000000..c41f00e590bd
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.6.1.0.ebuild
@@ -0,0 +1,141 @@
+# 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 $
+
+inherit python wxwidgets eutils
+
+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="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa"
+IUSE="gtk gtk2 unicode opengl"
+
+RDEPEND=">=dev-lang/python-2.1
+	=x11-libs/wxGTK-2.6.1*
+	!<dev-python/wxpython-2.4.2.4-r1
+	gtk2? ( >=x11-libs/gtk+-2.0
+		>=x11-libs/pango-1.2
+		>=dev-libs/glib-2.0 )
+	unicode? ( >=x11-libs/gtk+-2.0
+		>=x11-libs/pango-1.2
+		>=dev-libs/glib-2.0 )
+	!gtk2? ( =x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2* )
+	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}
+	gtk2? ( dev-util/pkgconfig )
+	sys-apps/sed"
+
+S="${WORKDIR}/${MY_P}/wxPython/"
+
+pkg_setup() {
+	if  use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+	fi
+}
+
+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-${PV}.diff
+}
+
+src_compile() {
+	local mypyconf
+	export WX_GTK_VER="2.6"
+	if ! use gtk2; then
+		need-wxwidgets gtk
+	elif use unicode; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
+	fi
+
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	use opengl \
+		&& 	mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	use gtk2 \
+		&&	mypyconf="${mypyconf} WXPORT=gtk2" \
+		|| mypyconf="${mypyconf} WXPORT=gtk"
+
+	use unicode && mypyconf="${mypyconf} UNICODE=1"
+
+	python setup.py ${mypyconf} build || die "build failed"
+}
+
+src_install() {
+	python_version
+	local mypyconf
+	local site_pkgs=/usr/lib/python${PYVER}/site-packages
+	dodir ${site_pkgs}
+
+	if ! use gtk2; then
+		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
+		need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE"
+	fi
+
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	use opengl \
+		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	use gtk2 \
+		&& mypyconf="${mypyconf} WXPORT=gtk2" \
+		|| mypyconf="${mypyconf} WXPORT=gtk"
+
+	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
+		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
+
+	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"
+}
+