Version bump.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26-rc9 x86_64

5 files changed, 288 insertions, 5 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index dce125974488..5b7a89014c84 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.88 2008/05/29 16:40:05 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.89 2008/07/25 02:44:24 dirtyepic Exp $
+
+*wxpython-2.8.8.1 (25 Jul 2008)
+
+  25 Jul 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxpython-2.8.8.1-musthaveapp.patch,
+  +files/wxpython-2.8.8-wxversion-scripts.patch, +wxpython-2.8.8.1.ebuild:
+  Version bump.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> wxpython-2.6.4.0-r1.ebuild,
   wxpython-2.8.7.1.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index be2ac0c9e0d9..21efde41d789 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -4,17 +4,21 @@ Hash: SHA1
 AUX scripts-multiver-2.6.1.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
 AUX wxpy-config.py 3265 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 SHA1 5947fa3cdd4bb8689ae822c0079b4b12652cf329 SHA256 1097d2b169f3c97f149032f5f647e1920d89288dc91981ad85b2d3ae28baf8ef
 AUX wxpython-2.8.7-wxversion-scripts.patch 5398 RMD160 adfc0a4e6f5c2d250a286797497f196c8d9245b5 SHA1 baef1948662b0e2456cca1132cdc34f51425bc03 SHA256 5bfac59e5f88a9dd40d0a98e02a10709093814a7961fd61f75b0a37d5d0ec14a
+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
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.7.1.tar.bz2 26362160 RMD160 c22d6eb1dfcd165226b0ff50bfeb2aed21763a8e SHA1 5526ee4c4cc57bcebb4950ea05e24639ef8b02dd SHA256 4683dd50208b816a7fa482c4694fc4c132d8a18708102898377388ea32e083f3
+DIST wxPython-src-2.8.8.1.tar.bz2 27712841 RMD160 4ee33e256cc0d8caae1676b023db0b56fa435ba7 SHA1 96027778c9d8dbfbc08a1aecb2dbe358b947b897 SHA256 47821e4eda2d5b61106db08e25e53ab47999672e09ed82b523a8a11f3e83ba26
 EBUILD wxpython-2.6.4.0-r1.ebuild 3428 RMD160 90ec50937102e86f962c4176d912153939861fdc SHA1 6117026d7bb30b8bd1e47e96e811216610ff9a67 SHA256 16ddc787581dbe16fc83a619927e30650cee617876f73cb0b4ec1e373f1cb56b
 EBUILD wxpython-2.6.4.0.ebuild 2733 RMD160 cdcc90fb9599993465816f235255350103105744 SHA1 5952c65cb7b3bf08bef72753bd45afdb5bed9f7e SHA256 cc794650af0d6a9bca83f744c6564381ad03139f4fdf32e51c58ffa3a428d22a
 EBUILD wxpython-2.8.7.1.ebuild 3180 RMD160 c920d60a91feeab7ce49b1cfbef772100af657e1 SHA1 16c4bdda4a23132079ea66bbe963f6a221b7a342 SHA256 1687659c0ca6fde1de777e20dfe7ac3b03b727ec15b52a3d6232a28ca6985a5d
-MISC ChangeLog 18290 RMD160 1558948d4a2938c4e8725287435b642816f7afcc SHA1 85bd3e35095ed9ad79bde85dd3ddc3294a6ea58b SHA256 de8c91a58c3acac781b1571a18e29357e9550d8423722d8ee100d0c999db491d
+EBUILD wxpython-2.8.8.1.ebuild 3335 RMD160 919277cc2ca7035f2ec3863c37a02e866ef259c7 SHA1 7c7fe73a04d06d3ee57bd84b8da4a0e9820f55b2 SHA256 f064234509a7ca36ee2df552de4d3ddbcdea9dd9babdc1015465c2f9a977987e
+MISC ChangeLog 18510 RMD160 d8b404a5dd64d909d12d62fe318b5095eeb7d737 SHA1 dffea709c1120578d71a0955f853390b611845b1 SHA256 a5c3378678129724db9f431a7fdfeaf53b75e444d7afff450ddf0676991a7c74
 MISC metadata.xml 182 RMD160 854b62a8f90b8e537eeeb2287109bb33b9d02076 SHA1 9d840a803ee19dcc523f4874a410c19d8fa189bc SHA256 a0ce0d5d8f96469b2adce5c456f7330502502a1bfa4269574bd2c0a9b8ecae08
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+3GgACgkQQU4yORhF8iBo1QCfeyfsVDMzw2oRkiwFyKUPjUCz
-smAAn3F0XYWAgVSVX90cvudDEySYKaUd
-=W3i3
+iEUEARECAAYFAkiJPgwACgkQiqiDRvmkBmIwWwCeLWis8iM93UW7NG0ubzEUnRfj
+iAgAmMar4k47+YHwoGNpNj6Aw30f9Nw=
+=vvB5
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/files/wxpython-2.8.8-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.8.8-wxversion-scripts.patch
new file mode 100644
index 000000000000..95d5da3abade
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.8-wxversion-scripts.patch
@@ -0,0 +1,131 @@
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/editra wxPython-src-2.8.8.0/wxPython/scripts/editra
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/editra	2008-02-29 14:32:17.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/editra	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.Editra.launcher import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.8.0/wxPython/scripts/genaxmodule
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/genaxmodule	2008-02-29 14:32:17.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/genaxmodule	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.genaxmodule import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/helpviewer wxPython-src-2.8.8.0/wxPython/scripts/helpviewer
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/helpviewer	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/helpviewer	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.helpviewer import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/img2png wxPython-src-2.8.8.0/wxPython/scripts/img2png
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/img2png	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/img2png	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.img2png import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/img2py wxPython-src-2.8.8.0/wxPython/scripts/img2py
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/img2py	2008-02-29 14:32:17.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/img2py	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.img2py import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/img2xpm wxPython-src-2.8.8.0/wxPython/scripts/img2xpm
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/img2xpm	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/img2xpm	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.img2xpm import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.8.0/wxPython/scripts/pyalacarte
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/pyalacarte	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/pyalacarte	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyAlaCarte import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/pyalamode wxPython-src-2.8.8.0/wxPython/scripts/pyalamode
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/pyalamode	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/pyalamode	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyAlaMode import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/pycrust wxPython-src-2.8.8.0/wxPython/scripts/pycrust
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/pycrust	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/pycrust	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyCrust import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/pyshell wxPython-src-2.8.8.0/wxPython/scripts/pyshell
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/pyshell	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/pyshell	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyShell import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/pywrap wxPython-src-2.8.8.0/wxPython/scripts/pywrap
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/pywrap	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/pywrap	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyWrap import main
+ main()
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/pywxrc wxPython-src-2.8.8.0/wxPython/scripts/pywxrc
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/pywxrc	2008-02-29 14:32:17.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/pywxrc	2008-06-26 17:39:49.000000000 -0600
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
+-
++import wxversion
++wxversion.select("2.8")
+ from wx.tools.pywxrc import main
+ main()
+-
+diff -Naur wxPython-src-2.8.8.0-orig/wxPython/scripts/xrced wxPython-src-2.8.8.0/wxPython/scripts/xrced
+--- wxPython-src-2.8.8.0-orig/wxPython/scripts/xrced	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.8.0/wxPython/scripts/xrced	2008-06-26 17:38:39.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.XRCed.xrced import main
+ main()
diff --git a/dev-python/wxpython/files/wxpython-2.8.8.1-musthaveapp.patch b/dev-python/wxpython/files/wxpython-2.8.8.1-musthaveapp.patch
new file mode 100644
index 000000000000..d3ae2e90d48b
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.8.1-musthaveapp.patch
@@ -0,0 +1,19 @@
+diff -Naurp wxPython-src-2.8.8.1-orig/wxPython/src/_config.i wxPython-src-2.8.8.1/wxPython/src/_config.i
+--- wxPython-src-2.8.8.1-orig/wxPython/src/_config.i	2008-07-24 16:02:07.000000000 -0600
++++ wxPython-src-2.8.8.1/wxPython/src/_config.i	2008-07-24 16:02:53.000000000 -0600
+@@ -391,7 +391,6 @@ time)", "");
+ 
+ //---------------------------------------------------------------------------
+ 
+-MustHaveApp(wxConfig);
+ 
+ DocStr(wxConfig,
+ "This ConfigBase-derived class will use the registry on Windows,
+@@ -413,7 +412,6 @@ public:
+ 
+ 
+ 
+-MustHaveApp(wxFileConfig);
+ 
+ DocStr(wxFileConfig,
+        "This config class will use a file for storage on all platforms.", "");
diff --git a/dev-python/wxpython/wxpython-2.8.8.1.ebuild b/dev-python/wxpython/wxpython-2.8.8.1.ebuild
new file mode 100644
index 000000000000..73d99c71719b
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.8.8.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.8.1.ebuild,v 1.1 2008/07/25 02:44:24 dirtyepic Exp $
+
+EAPI="1"
+WX_GTK_VER="2.8"
+
+inherit alternatives eutils multilib python wxwidgets
+
+# Note, we don't use distutils.eclass because it doesn't seem to play nice with
+# need-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"
+
+LICENSE="wxWinLL-3"
+SLOT="2.8"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="opengl"
+
+# FIXME - change wxGTK back to >=x11-libs/wxGTK-${PV}:2.8
+#         before commiting
+RDEPEND=">=dev-lang/python-2.1
+	>=x11-libs/wxGTK-${PV}:2.8
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	opengl? ( >=dev-python/pyopengl-2.0.0.44 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/wxPython/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-2.8.8-wxversion-scripts.patch
+	epatch "${FILESDIR}"/${P}-musthaveapp.patch # 2.8.8.1 only
+}
+
+src_compile() {
+	local mypyconf
+
+	need-wxwidgets unicode
+	use opengl && check_wxuse opengl
+
+	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} 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
+
+	for dir in "${D}"/${site_pkgs}/wx-${SLOT}-gtk2-{ansi,unicode}; do
+		if [[ -d ${dir} ]]; then
+			cp -R "${D}"/${site_pkgs}/wxaddons/ "${dir}"
+			wxaddons_copied=1
+		fi
+	done
+
+	[[ ${wxaddons_copied} ]] && rm -rf "${D}"/${site_pkgs}/wxaddons/
+}
+
+pkg_postinst() {
+	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
+
+	python_mod_optimize ${site_pkgs}
+
+	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 2.6 or 2.8"
+	elog "with your apps:"
+	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
+	echo
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+
+	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
+
+	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]"
+}