Version bump. Masked for testing.

Package-Manager: portage-2.1.4_rc11

5 files changed, 279 insertions, 5 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 4483bddb3935..be644928db19 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.73 2007/12/22 22:25:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.74 2007/12/24 02:01:57 dirtyepic Exp $
+
+*wxpython-2.8.7.1 (24 Dec 2007)
+
+  24 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxpython-2.8.7-wxversion-scripts.patch, +wxpython-2.8.7.1.ebuild:
+  Version bump.  Masked for testing.
 
   22 Dec 2007; nixnut <nixnut@gentoo.org> wxpython-2.6.4.0-r1.ebuild:
   Added ~ppc wrt bug 199594
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index c9afdccfbb26..a9480836e8d8 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scripts-multiver-2.6.1.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
 MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.1.0.diff 3373
 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 files/scripts-multiver-2.6.1.0.diff 3373
@@ -6,8 +9,13 @@ AUX wxpy-config.py 3265 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 SHA1 594
 MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265
 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 files/wxpy-config.py 3265
 SHA256 1097d2b169f3c97f149032f5f647e1920d89288dc91981ad85b2d3ae28baf8ef files/wxpy-config.py 3265
+AUX wxpython-2.8.7-wxversion-scripts.patch 5398 RMD160 adfc0a4e6f5c2d250a286797497f196c8d9245b5 SHA1 baef1948662b0e2456cca1132cdc34f51425bc03 SHA256 5bfac59e5f88a9dd40d0a98e02a10709093814a7961fd61f75b0a37d5d0ec14a
+MD5 7da3dbdb1c62236baec5d70c191f6a51 files/wxpython-2.8.7-wxversion-scripts.patch 5398
+RMD160 adfc0a4e6f5c2d250a286797497f196c8d9245b5 files/wxpython-2.8.7-wxversion-scripts.patch 5398
+SHA256 5bfac59e5f88a9dd40d0a98e02a10709093814a7961fd61f75b0a37d5d0ec14a files/wxpython-2.8.7-wxversion-scripts.patch 5398
 DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60f3692eb783 SHA1 e55a3a8cfbd1aff394be15297ae205a8c597bed8 SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
 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
 EBUILD wxpython-2.6.3.3.ebuild 3182 RMD160 f1646d6d0361aed77863caebd1a4dee9eefe1c04 SHA1 ce776c4a856cbbd49766e765cfef655a7282625d SHA256 598352ccd7ba01356c1c077c1ca7d8cb6730e13c17d86cf59fd6d1d96e79723a
 MD5 51185b662f6ec740dff58a664727b2d2 wxpython-2.6.3.3.ebuild 3182
 RMD160 f1646d6d0361aed77863caebd1a4dee9eefe1c04 wxpython-2.6.3.3.ebuild 3182
@@ -20,10 +28,14 @@ EBUILD wxpython-2.6.4.0.ebuild 2740 RMD160 abb06a005fc7748a1533da4aac380763565d4
 MD5 2a0dd011e34dd23a5ef1f59b7396479f wxpython-2.6.4.0.ebuild 2740
 RMD160 abb06a005fc7748a1533da4aac380763565d43c2 wxpython-2.6.4.0.ebuild 2740
 SHA256 a584048628377befaa438d9e018630c4f2385aa9a44194cb443ec045d5c558ab wxpython-2.6.4.0.ebuild 2740
-MISC ChangeLog 16157 RMD160 455b7cb60faceebfdb128b0a540c7630240699e9 SHA1 e2e4c588712827c52420d46e0f3191c7c779b9b5 SHA256 257e98ad7f9d4965e8476d94be3fffd6c67c6593bce9b19d6cb9d447accb4e8b
-MD5 faa8e4436e35ffd1721e7c61aafee612 ChangeLog 16157
-RMD160 455b7cb60faceebfdb128b0a540c7630240699e9 ChangeLog 16157
-SHA256 257e98ad7f9d4965e8476d94be3fffd6c67c6593bce9b19d6cb9d447accb4e8b ChangeLog 16157
+EBUILD wxpython-2.8.7.1.ebuild 2897 RMD160 1cfab1b059174abbf6dcc9b23946e6c9c3e3dde9 SHA1 8722efdff93814ac93c3c4244f4a1117bb332964 SHA256 ab4ee2594172cc6273bcf7b7d6dbbc581c73a4c70ba02312be81ef81dcd62d0f
+MD5 e7e5069507a95326966e64687fb7359e wxpython-2.8.7.1.ebuild 2897
+RMD160 1cfab1b059174abbf6dcc9b23946e6c9c3e3dde9 wxpython-2.8.7.1.ebuild 2897
+SHA256 ab4ee2594172cc6273bcf7b7d6dbbc581c73a4c70ba02312be81ef81dcd62d0f wxpython-2.8.7.1.ebuild 2897
+MISC ChangeLog 16354 RMD160 a020e48006bc92b2f78d6555933e3b61ad4e4ddc SHA1 90814183f8025e9a53e9fea8bd6076e34b444df2 SHA256 fb17ce67fde5e6f0c02703145951fa32d4870994da02981c218acd3889d5c7c0
+MD5 26ef9289f73639e3a278b82c9898c181 ChangeLog 16354
+RMD160 a020e48006bc92b2f78d6555933e3b61ad4e4ddc ChangeLog 16354
+SHA256 fb17ce67fde5e6f0c02703145951fa32d4870994da02981c218acd3889d5c7c0 ChangeLog 16354
 MISC metadata.xml 182 RMD160 ea41002477d2dd03185feb91318022c593ab267f SHA1 104f632f29e5a0bafbe01ab77d3565326054ab3b SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5
 MD5 f3c5a27935083d6431dbc3401b897b92 metadata.xml 182
 RMD160 ea41002477d2dd03185feb91318022c593ab267f metadata.xml 182
@@ -37,3 +49,13 @@ SHA256 1404a03e99b28ea09a2469be3919e28da39a2f8a0fb8443b2cccc9ec43d0aade files/di
 MD5 f496654bafb9821890f407c13e4229de files/digest-wxpython-2.6.4.0-r1 271
 RMD160 9814e2bef74890e3742b4454037db4ddf0b1ddb3 files/digest-wxpython-2.6.4.0-r1 271
 SHA256 1404a03e99b28ea09a2469be3919e28da39a2f8a0fb8443b2cccc9ec43d0aade files/digest-wxpython-2.6.4.0-r1 271
+MD5 16a83c00efb7cffcc252710da5e1b150 files/digest-wxpython-2.8.7.1 271
+RMD160 979ef657661bd66c15cbedf5d9707535ae0ab30f files/digest-wxpython-2.8.7.1 271
+SHA256 8531b5ba29a31f35b419ac4a011209640df603c73b00cc48b9aa092ca02e5534 files/digest-wxpython-2.8.7.1 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkdvEy4ACgkQiqiDRvmkBmJDpACgg5ywCJVHtd4cNC0G4+qNMwXo
+9NEAoL3ll88YC0zyyGL0alBwAVRtHBKk
+=RedA
+-----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/files/digest-wxpython-2.8.7.1 b/dev-python/wxpython/files/digest-wxpython-2.8.7.1
new file mode 100644
index 000000000000..37ff37eafa0c
--- /dev/null
+++ b/dev-python/wxpython/files/digest-wxpython-2.8.7.1
@@ -0,0 +1,3 @@
+MD5 04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2 26362160
+RMD160 c22d6eb1dfcd165226b0ff50bfeb2aed21763a8e wxPython-src-2.8.7.1.tar.bz2 26362160
+SHA256 4683dd50208b816a7fa482c4694fc4c132d8a18708102898377388ea32e083f3 wxPython-src-2.8.7.1.tar.bz2 26362160
diff --git a/dev-python/wxpython/files/wxpython-2.8.7-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.8.7-wxversion-scripts.patch
new file mode 100644
index 000000000000..dc6c97c1a0ae
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.7-wxversion-scripts.patch
@@ -0,0 +1,130 @@
+diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/editra wxPython-src-2.8.7.1/wxPython/scripts/editra
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/editra	2007-11-12 21:55:32.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/editra	2007-12-03 16:16:15.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ import sys, os
+ import wx.tools
+diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.7.1/wxPython/scripts/genaxmodule
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/genaxmodule	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/genaxmodule	2007-12-03 16:16:26.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ import sys
+ from wx.tools.genaxmodule import main
+diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/helpviewer wxPython-src-2.8.7.1/wxPython/scripts/helpviewer
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/helpviewer	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/helpviewer	2007-12-03 16:16:35.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.7.1-orig/wxPython/scripts/img2png wxPython-src-2.8.7.1/wxPython/scripts/img2png
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/img2png	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/img2png	2007-12-03 16:16:42.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.7.1-orig/wxPython/scripts/img2py wxPython-src-2.8.7.1/wxPython/scripts/img2py
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/img2py	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/img2py	2007-12-03 16:16:52.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ import sys
+ from wx.tools.img2py import main
+diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/img2xpm wxPython-src-2.8.7.1/wxPython/scripts/img2xpm
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/img2xpm	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/img2xpm	2007-12-03 16:16:59.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.7.1-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.7.1/wxPython/scripts/pyalacarte
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/pyalacarte	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/pyalacarte	2007-12-03 16:17:07.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.7.1-orig/wxPython/scripts/pyalamode wxPython-src-2.8.7.1/wxPython/scripts/pyalamode
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/pyalamode	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/pyalamode	2007-12-03 16:17:16.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.7.1-orig/wxPython/scripts/pycrust wxPython-src-2.8.7.1/wxPython/scripts/pycrust
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/pycrust	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/pycrust	2007-12-03 16:17:28.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.7.1-orig/wxPython/scripts/pyshell wxPython-src-2.8.7.1/wxPython/scripts/pyshell
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/pyshell	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/pyshell	2007-12-03 16:17:46.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.7.1-orig/wxPython/scripts/pywrap wxPython-src-2.8.7.1/wxPython/scripts/pywrap
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/pywrap	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/pywrap	2007-12-03 16:17:56.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.7.1-orig/wxPython/scripts/pywxrc wxPython-src-2.8.7.1/wxPython/scripts/pywxrc
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/pywxrc	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/pywxrc	2007-12-03 16:18:02.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ import sys
+ from wx.tools.pywxrc import main
+ main(sys.argv[1:])
+diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/xrced wxPython-src-2.8.7.1/wxPython/scripts/xrced
+--- wxPython-src-2.8.7.1-orig/wxPython/scripts/xrced	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.7.1/wxPython/scripts/xrced	2007-12-03 16:19:51.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/wxpython-2.8.7.1.ebuild b/dev-python/wxpython/wxpython-2.8.7.1.ebuild
new file mode 100644
index 000000000000..fc2635825255
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.8.7.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.7.1.ebuild,v 1.1 2007/12/24 02:01:57 dirtyepic Exp $
+
+WX_GTK_VER="2.8"
+
+inherit alternatives eutils 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"
+
+LICENSE="wxWinLL-3"
+SLOT="2.8"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="opengl"
+
+RDEPEND=">=dev-lang/python-2.1
+	>=x11-libs/wxGTK-${PV}
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	>=sys-libs/zlib-1.1.4
+	opengl? ( >=dev-python/pyopengl-2.0.0.44 )
+	!<dev-python/wxpython-2.4.2.4-r1"
+
+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.7-wxversion-scripts.patch
+
+}
+
+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
+
+	dodir ${site_pkgs}
+
+	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 --prefix=/usr --root="${D}" \
+		|| die "setup.py install failed"
+
+	# Collision protection.
+	for file in \
+		"${D}"/usr/bin/* \
+		"${D}"/${site_pkgs}/wx{version.*,.pth,addons}; do
+			mv "${file}" "${file}-${SLOT}"
+	done
+}
+
+pkg_postinst() {
+	python_mod_optimize
+
+	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]"
+
+	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]"
+}