Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 187 insertions, 7 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 4c7ca47462e1..a1e62a8ee145 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/wxpython
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.121 2009/02/21 22:36:28 dirtyepic Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.122 2009/05/18 03:21:16 dirtyepic Exp $
+
+*wxpython-2.8.10.1 (18 May 2009)
+
+  18 May 2009; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.10.1.ebuild:
+  Version bump.
 
 *wxpython-2.8.9.2 (21 Feb 2009)
 
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 35b690ad295b..47733ae9b260 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -10,25 +10,29 @@ AUX wxpython-2.8.7-wxversion-scripts.patch 5398 RMD160 adfc0a4e6f5c2d250a2867974
 AUX wxpython-2.8.8-wxversion-scripts.patch 5388 RMD160 8c51be3ac56ea90889eaff571ede147fc8ef536a SHA1 d1737d4b82dcb4c180c0698c619b1c9bf06fa58f SHA256 0f911b437f638004b05c9d53ba9ca6498b9d85c793da3ba40787365cad079175
 AUX wxpython-2.8.8.1-musthaveapp.patch 670 RMD160 5559f0157923a729c7375e3013a86bfb2a72a5e9 SHA1 752137c1ebf5ea79960825327c14a83d7b4fa1ed SHA256 833aeeb168b78e6c32f4ece8dae6b3749250aa83eaeec07065420a425a5df8af
 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.9.1.tar.bz2 2989325 RMD160 39637183f4579e721e8d7354cd318146de1919c5 SHA1 ae06559ddb30a9ccc94db424e71b76d4aef16753 SHA256 7d9a9d276de5b27fce97ff319a442c7d68f754156207a57b6e0aa89c3f6882a8
 DIST wxPython-demo-2.8.9.2.tar.bz2 3552309 RMD160 e5ac5345f7503b4c3d483f681c39e26c7a3b3e54 SHA1 65e88f974de90d2f6843d1a9b2e0c0949441721c SHA256 0b18274f2aeec8293731406f456ba9d435aee99ef38b1533df8f1291b4736294
+DIST wxPython-docs-2.8.10.1.tar.bz2 2331639 RMD160 c1eadac650401895ae32739b316cda3c06cd60bf SHA1 d096994904aabdc23ca6717af640b32963798a16 SHA256 3992384869dcb3c757da5f4e63e7ef4ab24f2fa1842edd5e126be4856bb951c0
 DIST wxPython-docs-2.8.9.1.tar.bz2 2331065 RMD160 441e626b243fc01cb20a6c6e46b191f1c25a7cd1 SHA1 317dda174b4a85cc548125d7f58f9093686eace9 SHA256 2f0a23b0256dadaf9cec7869fd68a94035d5680c19264e55cfa229d79fe08e54
 DIST wxPython-docs-2.8.9.2.tar.bz2 2331251 RMD160 a2b7326e500a64994e2a782142491c03222c6a9e SHA1 6150721a762183a2d83bcd666ba5c9038283bb0d SHA256 c384c6d89aded996d17f72f4111a0b0c6891d17eee8f5a3a890b474a548d89f6
 DIST wxPython-newdocs-2.8.9.1.tar.bz2 1353170 RMD160 db69d32d7b25432d8159e5935e5edcb26f74b453 SHA1 014424980945e6ee0b684f71b3cbc0b6a7ea48ff SHA256 a1c951c190c491d5a784da11100dca13daab442877e36f00255a55ffbcdd026e
 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.9.1.tar.bz2 27969655 RMD160 2b193c867a028985f8ead4084a9c1f024a1d37c6 SHA1 7359af790d58082330c867f5c10f51b6382d9a35 SHA256 584bc8a90e413409c20d1aff05bf547809fc2b57b74c5aba60fc3a2a98a0e7fa
 DIST wxPython-src-2.8.9.2.tar.bz2 29370216 RMD160 93a9bd35b59e16674375b1431e24d47b58a824d2 SHA1 a0d58d8b9606d04a35b9853da15eb7dfb08d5637 SHA256 0683ef245d7c121dea7f16f08f0d2cd77348d588e6831cc3bc88cf23dc6029b5
 EBUILD wxpython-2.6.4.0-r2.ebuild 3496 RMD160 e2311eca456d563af27f652fcba6a9467109dd3e SHA1 c12e6707f17cea848af5347cddc947269fca8732 SHA256 3dd2915486e0a3ae4a23410ce925947fe9c954b9c914a9aa3254c407501fcebd
+EBUILD wxpython-2.8.10.1.ebuild 5058 RMD160 c895a28a3dd91665216894a6dbdb73880cc3d59e SHA1 85cb08d4b269e5d7d05ee4a2c8745a8061de4503 SHA256 6660c01c6a49816a6fd06e9b493da7638b835079f266f324665344db4505c045
 EBUILD wxpython-2.8.9.1-r2.ebuild 3216 RMD160 81c085fb7b5db38d1ef8c2e2e43c83ddd1c22283 SHA1 bf719fe89f16927f854c13e2ac7336be5e881acb SHA256 42748d9f85f50d767875e0199cfbb553c4b1382293b07584ea695a3ac35752da
 EBUILD wxpython-2.8.9.1-r3.ebuild 4685 RMD160 9f51a2fd4fbee353486487abb432c0c8a1eed144 SHA1 75bf0a1345df4b8a1d15cbf5b0ae2d6e86e32544 SHA256 74eb85c5194df02157eaa2cf544adb5f4dee9f01a0097a31e61c889df3a15d71
 EBUILD wxpython-2.8.9.2.ebuild 4987 RMD160 b4d736425671002221c13a35e193fec8b2c225e5 SHA1 10fbb799fb24784522eee65acfef7f29aab420ac SHA256 719b20ad74d1751e357ecc36c0200ad9f8be3a4db1b01d5af13248ca5db30c1b
-MISC ChangeLog 23283 RMD160 08ca42c50b3e757f3c9c42d87fa912519db68927 SHA1 ab048cb761a5b6281cd5178893e96f52e4d59a87 SHA256 25a49b987acb8e07c70c316441df4aaeda72677229026157a05986ff102d4943
+MISC ChangeLog 23409 RMD160 6128e03dc1b89c968c9c28b72f1b7c61eb9396d7 SHA1 3befe3483806bd0ed2f95474b0b2d5003a40f1a1 SHA256 016ef122386e915d259d10295f22f9643246da7ec537e9b001dfaf58a04f15c3
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmggkkACgkQiqiDRvmkBmKLvwCgzXeqwDb68NPiixP5L1fOyxcy
-a9QAoMl/2MX65XWvnjQqCsFybO92BeXz
-=7DSl
+iEYEARECAAYFAkoQ1LgACgkQiqiDRvmkBmJd5wCg3GDWuykWd+fiFwYShDAuk+hs
+wEYAoL6wOezoZ8KkPcvIgN6RT1xoIuai
+=lDOt
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.8.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
new file mode 100644
index 000000000000..70fb92541d3b
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.1 2009/05/18 03:21:16 dirtyepic Exp $
+
+EAPI="2"
+WX_GTK_VER="2.8"
+
+inherit alternatives eutils multilib python wxwidgets flag-o-matic fdo-mime
+
+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 opengl doc examples"
+
+RDEPEND="
+	>=x11-libs/wxGTK-${PV}:2.8[opengl?]
+	>=dev-lang/python-2.4
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	cairo?	( >=dev-python/pycairo-1.8.4 )
+	opengl?	( >=dev-python/pyopengl-2.0.0.44 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+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}-${SLOT}-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
+}
+
+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() {
+	python setup.py ${mypyconf} build || die "setup.py build failed"
+}
+
+src_install() {
+	local mypyconf
+	python_version
+	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
+
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	use opengl \
+		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
+
+	python setup.py ${mypyconf} install --root="${D}" \
+		--install-purelib ${site_pkgs} || die "setup.py install failed"
+
+	# Collision protection.
+	for file in "${D}"/usr/bin/* "${D}"/${site_pkgs}/wx{version.*,.pth}; do
+		mv "${file}" "${file}-${SLOT}"
+	done
+
+	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 2.8.10.1 api docs are not 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() {
+	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
+
+	python_mod_optimize ${site_pkgs}
+
+	fdo-mime_desktop_database_update
+
+	alternatives_auto_makesym \
+		"${site_pkgs}/wx.pth" "${site_pkgs}/wx.pth-[0-9].[0-9]"
+	alternatives_auto_makesym \
+		"${site_pkgs}/wxversion.py" "${site_pkgs}/wxversion.py-[0-9].[0-9]"
+
+	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
+
+	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
+
+	fdo-mime_desktop_database_update
+
+	alternatives_auto_makesym \
+		"${site_pkgs}/wx.pth" "${site_pkgs}/wx.pth-[0-9].[0-9]"
+	alternatives_auto_makesym \
+		"${site_pkgs}/wxversion.py" "${site_pkgs}/wxversion.py-[0-9].[0-9]"
+}