Version bump.

(Portage version: 2.2.0_alpha18/cvs/Linux x86_64)

4 files changed, 408 insertions, 2 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 860d0c84468d..58a806eb8acc 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/wxpython
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.138 2010/12/12 07:30:02 dirtyepic Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.139 2011/01/23 01:12:36 dirtyepic Exp $
+
+*wxpython-2.9.1.1 (23 Jan 2011)
+
+  23 Jan 2011; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.9.1.1.ebuild,
+  +files/wxpython-2.9-wxversion-demo.patch,
+  +files/wxpython-2.9-wxversion-scripts.patch:
+  Version bump.
 
   12 Dec 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild,
   wxpython-2.8.10.1.ebuild, wxpython-2.8.11.0.ebuild:
diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch
new file mode 100644
index 000000000000..c928ae27d851
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch
@@ -0,0 +1,10 @@
+--- demo/demo.org
++++ demo/demo.py
+@@ -1,4 +1,7 @@
+ #!/usr/bin/env python
+ 
++import wxversion
++wxversion.select("2.9")
++
+ import Main
+ Main.main()
diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch
new file mode 100644
index 000000000000..d037cc95decc
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch
@@ -0,0 +1,221 @@
+--- a/distrib/PyAlaMode.desktop
++++ b/distrib/PyAlaMode.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyAlaMode
++Name=PyAlaMode (2.9)
+ Comment=GUI Python Shell with Filling and editor windows
+-Exec=pyalamode
+-Icon=PyCrust.png
++Exec=pyalamode-2.9
++Icon=/usr/share/pixmaps/PyCrust-2.9.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+--- a/distrib/PyCrust.desktop
++++ b/distrib/PyCrust.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyCrust
++Name=PyCrust (2.9)
+ Comment=GUI Python Shell with Filling
+-Exec=pycrust
+-Icon=PyCrust.png
++Exec=pycrust-2.9
++Icon=/usr/share/pixmaps/PyCrust-2.9.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+--- a/distrib/PyShell.desktop
++++ b/distrib/PyShell.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyShell
++Name=PyShell (2.9)
+ Comment=GUI Python Shell
+-Exec=pyshell
+-Icon=PyCrust.png
++Exec=pyshell-2.9
++Icon=/usr/share/pixmaps/PyCrust-2.9.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+--- a/distrib/PySlices.desktop
++++ b/distrib/PySlices.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PySlices
++Name=PySlices (2.9)
+ Comment=GUI Python Shell with Filling
+-Exec=pyslices
+-Icon=PySlices.png
++Exec=pyslices-2.9
++Icon=/usr/share/pixmaps/PySlices-2.9.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+--- a/distrib/PySlicesShell.desktop
++++ b/distrib/PySlicesShell.desktop
+@@ -1,9 +1,9 @@
+ 
+ [Desktop Entry]
+-Name=PySlicesShell
++Name=PySlicesShell (2.9)
+ Comment=GUI Python Shell
+-Exec=pysliceshell
+-Icon=PySlices.png
++Exec=pysliceshell-2.9
++Icon=/usr/share/pixmaps/PySlices-2.9.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+--- a/distrib/XRCed.desktop
++++ b/distrib/XRCed.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=XRCed
++Name=XRCed (2.9)
+ Comment=wxPython XRC resource editor
+-Exec=xrced
+-Icon=XRCed.png
++Exec=xrced-2.9
++Icon=/usr/share/pixmaps/XRCed-2.9.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+--- a/scripts/editra
++++ b/scripts/editra
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.tools.Editra.launcher import main
+ main()
+--- a/scripts/genaxmodule
++++ b/scripts/genaxmodule
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.tools.genaxmodule import main
+ main()
+--- a/scripts/helpviewer
++++ b/scripts/helpviewer
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.tools.helpviewer import main
+ main()
+--- a/scripts/img2png
++++ b/scripts/img2png
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.tools.img2png import main
+ main()
+--- a/scripts/img2py
++++ b/scripts/img2py
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.tools.img2py import main
+ main()
+--- a/scripts/img2xpm
++++ b/scripts/img2xpm
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.tools.img2xpm import main
+ main()
+--- a/scripts/pyalacarte
++++ b/scripts/pyalacarte
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.py.PyAlaCarte import main
+ main()
+--- a/scripts/pyalamode
++++ b/scripts/pyalamode
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.py.PyAlaMode import main
+ main()
+--- a/scripts/pycrust
++++ b/scripts/pycrust
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.py.PyCrust import main
+ main()
+--- a/scripts/pyshell
++++ b/scripts/pyshell
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.py.PyShell import main
+ main()
+--- a/scripts/pyslices
++++ b/scripts/pyslices
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.py.PySlices import main
+ main()
+--- a/scripts/pysliceshell
++++ b/scripts/pysliceshell
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.py.PySlicesShell import main
+ main()
+--- a/scripts/pywrap
++++ b/scripts/pywrap
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.py.PyWrap import main
+ main()
+--- a/scripts/pywxrc
++++ b/scripts/pywxrc
+@@ -1,5 +1,7 @@
+ #!/usr/bin/env python
+ 
++import wxversion
++wxversion.select("2.9")
+ from wx.tools.pywxrc import main
+ main()
+ 
+--- a/scripts/xrced
++++ b/scripts/xrced
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.9")
+ 
+ from wx.tools.XRCed.xrced import main
+ main()
diff --git a/dev-python/wxpython/wxpython-2.9.1.1.ebuild b/dev-python/wxpython/wxpython-2.9.1.1.ebuild
new file mode 100644
index 000000000000..7726a06c8f30
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.9.1.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.1.1.ebuild,v 1.1 2011/01/23 01:12:36 dirtyepic Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+WX_GTK_VER="2.9"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit alternatives eutils fdo-mime flag-o-matic multilib python wxwidgets
+
+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.bz2
+	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
+
+LICENSE="wxWinLL-3"
+SLOT="2.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cairo examples opengl"
+
+RDEPEND="
+	dev-python/setuptools
+	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	virtual/jpeg
+	media-libs/tiff
+	cairo?	( >=dev-python/pycairo-1.8.4 )
+	opengl?	( >=dev-python/pyopengl-2.0.0.44 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${MY_P}/wxPython"
+DOC_S="${WORKDIR}/wxPython-${PV}"
+
+src_prepare() {
+	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-scripts.patch
+	# drop editra - we have it as a separate package now
+	epatch "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
+
+	if use examples; then
+		cd "${DOC_S}"
+		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
+	fi
+
+	python_copy_sources
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	append-flags -fno-strict-aliasing
+
+	use opengl \
+		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
+}
+
+src_compile() {
+	building() {
+		"$(PYTHON)" setup.py ${mypyconf} build
+	}
+	python_execute_function -s building
+}
+
+src_install() {
+	local mypyconf
+
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	use opengl \
+		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
+
+	installation() {
+		"$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir)
+	}
+	python_execute_function -s installation
+
+	# this should be temporary
+	dobin "${S}"/scripts/pyslices || die
+	dobin "${S}"/scripts/pysliceshell || die
+
+	# Collision protection.
+	for file in "${D}"/usr/bin/*; do
+		mv "${file}" "${file}-${SLOT}" || die
+	done
+	rename_files() {
+		for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do
+			mv "${file}" "${file}-${SLOT}" || return 1
+		done
+	}
+	python_execute_function -q rename_files
+
+	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
+
+	insinto /usr/share/applications
+	for x in {Py{AlaMode,Crust,Shell,Slices{,Shell}},XRCed}; do
+		newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop || die
+	done
+	insinto /usr/share/pixmaps
+	newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png || die
+	newins "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png || die
+	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png || die
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/demo || die
+		dodir /usr/share/doc/${PF}/samples || die
+		cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/ || die
+		cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/ || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
+		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
+	}
+	python_execute_function -q create_symlinks
+
+	python_mod_optimize wx-2.9.1-gtk2 wxversion.py
+
+	echo
+	elog "Gentoo uses the Multi-version method for SLOT'ing."
+	elog "Developers, see this site for instructions on using"
+	elog "2.6 or 2.8 with your apps:"
+	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
+	elog
+	if use examples; then
+		elog "The demo.py app which contains hundreds of demo modules"
+		elog "with documentation and source code has been installed at"
+		elog "/usr/share/doc/${PF}/demo/demo.py"
+		elog
+		elog "Many more example apps and modules can be found in"
+		elog "/usr/share/doc/${PF}/samples/"
+	fi
+	echo
+	elog "Editra is no longer packaged with wxpython in Gentoo."
+	elog "You can find it in the tree as app-editors/editra"
+	echo
+}
+
+pkg_postrm() {
+	python_mod_cleanup wx-2.9.1-gtk2 wxversion.py
+	fdo-mime_desktop_database_update
+
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
+		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
+	}
+	python_execute_function -q create_symlinks
+}