Semi auto-sync

(manually editted for 3m 13s) -- dev-python/wxpython (2010-08-04 18:06:53.808814000 +0200)

(Portage version: 2.2.01.15478-prefix/svn/SunOS i386)

5 files changed, 265 insertions, 7 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 0e0a0ad037..06dea5a1f1 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,17 @@
 # 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.137 2010/07/27 03:13:09 dirtyepic Exp $
+
+  27 Jul 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild,
+  wxpython-2.8.10.1.ebuild:
+  Depend on wxGTK[X] (bug #327795 by Arttu Valo).
+
+*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 e91b5f526a..c936062da3 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,11 +1,16 @@
 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.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
-EBUILD wxpython-2.8.10.1.ebuild 5621 RMD160 d0d8bd1538b8315e5461122ad43638b8c75461a7 SHA1 9455dacb6f88854c4439b4a5c89d4513c9aeae42 SHA256 b98f2f1648c4a6dfad1cb25b0e70c94aa076152609f196ad66dfd4a12486c8fc
-MISC ChangeLog 25267 RMD160 52632f3ef4f6ecc537fef2c9557dffe99e0cc622 SHA1 b91e31415408c5b4a59c90796389b8466c070e39 SHA256 c603bb817685eb9659f53ce5ffd1515084d82ba09451a6c12fcff283edeef2ea
+DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
+EBUILD wxpython-2.8.10.1.ebuild 5730 RMD160 5d7f37cce6be251ee6033bb54301dfd19e1cabe2 SHA1 700b79b2d05a4a464ca3f2a2518c9b8161041fae SHA256 6f3240cdd1f1143f8d9597e712ccd53f16a8fdf8876a7e0be5fb028a98cc1015
+EBUILD wxpython-2.8.11.0.ebuild 5733 RMD160 d94185f92e0d0cc92d4d22f02e7dbf5f68b4581d SHA1 cd2d01dabcef322efd926f9602989fcb17329f26 SHA256 c4055ac6bcc333171df097e52bcb6d8195127ca844802c5fb2cb27f80ce9484c
+MISC ChangeLog 25632 RMD160 38d5c87c7b5434206d11fca344de369b07a3171c SHA1 b14920094d1946e6c1bf07660cc890595f7c1186 SHA256 d6a26ce526dc0b39b1e458b339f43ca1960e1c060dcd5fe3149b2916629ca1d6
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
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 0000000000..9555bb57ef
--- /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.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
index 453246e711..e428a05800 100644
--- a/dev-python/wxpython/wxpython-2.8.10.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
@@ -1,6 +1,6 @@
 # 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.10.1.ebuild,v 1.13 2010/03/07 09:49:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.16 2010/07/28 13:56:51 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -25,7 +25,8 @@ IUSE="aqua cairo doc examples opengl"
 
 RDEPEND="
 	dev-python/setuptools
-	>=x11-libs/wxGTK-${PV}:2.8[opengl?,aqua=]
+	aqua? ( >=x11-libs/wxGTK-${PV}:2.8[opengl?,aqua=] )
+	!aqua? ( >=x11-libs/wxGTK-${PV}:2.8[X,opengl?] )
 	>=x11-libs/gtk+-2.4[aqua=]
 	>=x11-libs/pango-1.2
 	>=dev-libs/glib-2.0
@@ -113,7 +114,7 @@ src_install() {
 	done
 	rename_files() {
 		for file in "${ED}$(python_get_sitedir)/"wx{version.*,.pth}; do
-			mv "${file}" "${file}-${SLOT}"
+			mv "${file}" "${file}-${SLOT}" || return 1
 		done
 	}
 	python_execute_function -q rename_files
@@ -181,7 +182,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup wx-${SLOT}-gtk2-unicode wxversion.py
 	fdo-mime_desktop_database_update
 
 	create_symlinks() {
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 0000000000..9e00630ee2
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.8.11.0.ebuild
@@ -0,0 +1,193 @@
+# 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.2 2010/07/28 13:56:51 arfrever 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="~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aqua cairo doc examples opengl"
+
+RDEPEND="
+	dev-python/setuptools
+	aqua? ( >=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,aqua=] )
+	!aqua? ( >=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,X] )
+	>=x11-libs/gtk+-2.4[aqua=]
+	>=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 )
+	aqua? ( >=dev-lang/python-2.6[aqua?] )"
+
+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} UNICODE=1"
+
+	use aqua \
+		&& mypyconf="${mypyconf} WXPORT=mac" \
+		|| mypyconf="${mypyconf} WXPORT=gtk2"
+}
+
+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} UNICODE=1"
+
+	use aqua \
+		&& mypyconf="${mypyconf} WXPORT=mac" \
+		|| mypyconf="${mypyconf} WXPORT=gtk2"
+
+	installation() {
+		"$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib "${EPREFIX}"$(python_get_sitedir)
+	}
+	python_execute_function -s installation
+
+	# Collision protection.
+	for file in "${ED}"/usr/bin/*; do
+		mv "${file}" "${file}-${SLOT}"
+	done
+	rename_files() {
+		for file in "${ED}$(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
+	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/* "${ED}"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/* "${ED}"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/* "${ED}"/usr/share/doc/${PF}/demo/
+		cp -R "${DOC_S}"/samples/* "${ED}"/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
+}