Version bump.

http://wxpython.org/recentchanges.php
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 255 insertions, 2 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 0e0a0ad03776..1c95c1998ff8 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.135 2010/03/05 22:30:45 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.136 2010/05/27 05:20:41 dirtyepic Exp $
+
+*wxpython-2.8.11.0 (27 May 2010)
+
+  27 May 2010; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.11.0.ebuild,
+  +files/wxpython-2.8.11-drop-editra.patch:
+  Version bump.
+  http://wxpython.org/recentchanges.php
 
   05 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild,
   wxpython-2.8.10.1.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index c7025c027334..e541d8eaf607 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,14 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scripts-multiver-2.6.1.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
 AUX wxpython-2.8-cache-writable.patch 538 RMD160 1d627cfae8a819850d6f6807b6547b138e63e5a0 SHA1 e6c4e5732f2a3792bea50a9ff51d233569ca490e SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429
 AUX wxpython-2.8-drop-editra.patch 2276 RMD160 dc3b1e9fbf57d5c5c4c97c6f6ccaf1bc00d5ebf9 SHA1 755549eea057f3f84ffdd19c3d7ea8f1ed7a3ca8 SHA256 b54b8ddf0f50e0d6c214d7e7d7105389a160a633ee2307b2f4a4c09b40a65f28
 AUX wxpython-2.8-wxversion-demo.patch 219 RMD160 5ec8b5179fe03493786965849494adb0f697eb23 SHA1 92ccb9e099def1ff9ff842b5bfbbd769c1d06c6e SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c
+AUX wxpython-2.8.11-drop-editra.patch 2197 RMD160 49364666c2c71f58bc89d63dbce7086cf786ea95 SHA1 9777b6e20a095249eb9a51f99ecefdea709c5066 SHA256 a0774e4c273485711cb3da4d70cf7bf0766a9f189fafdc7bae07186d553f341b
 AUX wxpython-2.8.9-wxversion-scripts.patch 7730 RMD160 e93c7b883b1ad22011df069d8d6ad24938ea8b07 SHA1 cf05e834a6e4325f51881f62113922e3aa20f5c4 SHA256 55b1caa38295338dda3cc9ebfa4e43eb3be76959a0ee9b23a7b81085d80d7ba6
 DIST wxPython-demo-2.8.10.1.tar.bz2 3605257 RMD160 00aa54621e3b0a16c2f77bb8b7663a64328c5e75 SHA1 2dc2df3ae3180866715ee7a2e9c2eb5bd7231ab2 SHA256 b2f15413e117547344a4b80db8bf6d2750c333454fcea427b38c9b62793643a0
+DIST wxPython-demo-2.8.11.0.tar.bz2 3894559 RMD160 74337736081d809e85e212c72a45cfd7bd23c236 SHA1 9e9a148bf8590d69bc652c535c8dc5b860f01043 SHA256 b4463d50bb597b66471e218f94e6e6f94e05689735038348f9689de941cc24d3
 DIST wxPython-docs-2.8.10.1.tar.bz2 2331639 RMD160 c1eadac650401895ae32739b316cda3c06cd60bf SHA1 d096994904aabdc23ca6717af640b32963798a16 SHA256 3992384869dcb3c757da5f4e63e7ef4ab24f2fa1842edd5e126be4856bb951c0
+DIST wxPython-docs-2.8.11.0.tar.bz2 2331727 RMD160 da31b1da7e8f4862c404a14de2216216ab53aae4 SHA1 6d42177e72b93f286f55cc298bc7ab29531ffa7f SHA256 1e95cf1033902fd4c7abc1b9d34688179f8b699a0f74455fec541a6ad421590d
 DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 RMD160 86084386383904972df15aa65ca26d1ad1a28a5d SHA1 eedef5ef87824b28a6fe4d338420cf6249ac1f2f SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
+DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
 EBUILD wxpython-2.6.4.0-r2.ebuild 3551 RMD160 67fb9c8f07b9809de54c4c09f4312411afda11c1 SHA1 71d9868264a094c150a1b139af6f5b857587ff56 SHA256 8ab48cd2ffc74c1c2531e8643572cef7440470d331001eb14151f9bf3c578919
 EBUILD wxpython-2.8.10.1.ebuild 5382 RMD160 11899555513d4e7e3d7aa98fde91fa0571f4e7db SHA1 198b8cb51bc0ac0b26f997bf5c9e5b17952c4b3d SHA256 892e83da078364002bdcad1ab8c1a75dd34aebf45b95199324a52c98321dd057
-MISC ChangeLog 25267 RMD160 52632f3ef4f6ecc537fef2c9557dffe99e0cc622 SHA1 b91e31415408c5b4a59c90796389b8466c070e39 SHA256 c603bb817685eb9659f53ce5ffd1515084d82ba09451a6c12fcff283edeef2ea
+EBUILD wxpython-2.8.11.0.ebuild 5393 RMD160 669abe158524e6897d36dc6f570a1e869b42da7c SHA1 8ba4f329d580d2624a726d9c3ffe29b68b31a5b9 SHA256 ea6138d6ba0209a7c7a6a962d6cb07a2cfa51ae063ea6a46ed4991cd98b90217
+MISC ChangeLog 25477 RMD160 87ef5aaba6f9a09a144659d4f6c568235a39eff2 SHA1 ffa47a3e932c4bcbac55253f7851546b0d4eaf91 SHA256 9c9ba1e83e02c203de41b8d56a929c8b592ffcbcda5d05ad317db2728fe406fa
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkv+AfEACgkQiqiDRvmkBmLqYQCfYxsfwfAeZ9kucJBk0tyDZLGw
+lOUAoLZ+l+kp8hB3tqb6X/G6qIrOLA/+
+=oQzK
+-----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
new file mode 100644
index 000000000000..9555bb57ef44
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
@@ -0,0 +1,48 @@
+--- a/wxPython/setup.py
++++ b/wxPython/setup.py
+@@ -887,13 +887,6 @@ WX_PKGLIST =      [ 'wx',
+                     'wx.tools',
+                     'wx.tools.XRCed',
+                     'wx.tools.XRCed.plugins',
+-                    'wx.tools.Editra',
+-                    'wx.tools.Editra.src',
+-                    'wx.tools.Editra.src.autocomp',
+-                    'wx.tools.Editra.src.eclib',
+-                    'wx.tools.Editra.src.ebmlib',
+-                    'wx.tools.Editra.src.extern',
+-                    'wx.tools.Editra.src.syntax',
+                     ]
+ 
+ if not EGGing:
+@@ -920,7 +913,6 @@ else:
+                opj('scripts/pywrap'),
+                opj('scripts/pywxrc'),
+                opj('scripts/xrced'),
+-               opj('scripts/editra'),
+                ]
+     if os.name == 'nt':
+         SCRIPTS.append( opj('scripts/genaxmodule') ) 
+@@ -934,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
+ DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
+ DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
+ 
+-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
+-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
+-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
+-                              '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
+-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
+-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
+-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
+-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
+-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
+ 
+ 
+ ## import pprint
+@@ -993,7 +976,6 @@ if EGGing:
+                                   'pyshell = wx.py.PyShell:main',
+                                   'pywrap = wx.py.PyWrap:main',
+                                   'helpviewer = wx.tools.helpviewer:main',
+-                                  'editra = wx.tools.Editra.launcher:main',
+                                   'xrced = wx.tools.XRCed.xrced:main',
+                                   ], 
+             },
diff --git a/dev-python/wxpython/wxpython-2.8.11.0.ebuild b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
new file mode 100644
index 000000000000..8f95c30ea6bd
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.1 2010/05/27 05:20:41 dirtyepic Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+WX_GTK_VER="2.8"
+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
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
+		   mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
+	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
+
+LICENSE="wxWinLL-3"
+SLOT="2.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cairo doc examples opengl"
+
+RDEPEND="
+	dev-python/setuptools
+	>=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,X]
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	media-libs/jpeg:0
+	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}-2.8.9-wxversion-scripts.patch
+	# drop editra - we have it as a separate package now
+	epatch "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
+
+	if use doc; then
+		cd "${DOC_S}"
+		epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch
+	fi
+
+	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
+
+	# Collision protection.
+	for file in "${D}"/usr/bin/*; do
+		mv "${file}" "${file}-${SLOT}"
+	done
+	rename_files() {
+		for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do
+			mv "${file}" "${file}-${SLOT}"
+		done
+	}
+	python_execute_function -q rename_files
+
+	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
+
+	insinto /usr/share/applications
+	doins "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
+	insinto /usr/share/pixmaps
+	newins "${S}"/wx/py/PyCrust_32.png PyCrust.png
+	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
+
+	if use doc; then
+		dodir /usr/share/doc/${PF}/docs
+		cp -R "${DOC_S}"/docs/* "${D}"usr/share/doc/${PF}/docs/
+		# For some reason newer API docs aren't available so use 2.8.9.2's
+		cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${D}"usr/share/doc/${PF}/docs/
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/demo
+		dodir /usr/share/doc/${PF}/samples
+		cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/
+		cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/
+	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-${SLOT}-gtk2-unicode 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 doc; then
+		elog "To access the general wxWidgets documentation, run"
+		elog "/usr/share/doc/${PF}/docs/viewdocs.py"
+		elog
+		elog "wxPython documentation is available by pointing a browser"
+		elog "at /usr/share/doc/${PF}/docs/api/index.html"
+		elog
+	fi
+	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
+	ewarn "Editra is no longer packaged with wxpython in Gentoo."
+	ewarn "You can find it in the tree as app-editors/editra"
+	echo
+}
+
+pkg_postrm() {
+	python_mod_cleanup wx-${SLOT}-gtk2-unicode 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
+}