Version bump. No major groundbreakery. Masked due to dep on

=x11-libs/wxGTK-2.6.4.0.
Package-Manager: portage-2.1.3.7

4 files changed, 132 insertions, 15 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index d0636cc711b7..5ddca4e02d6e 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.58 2007/05/07 10:30:20 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.59 2007/09/01 09:28:24 dirtyepic Exp $
+
+*wxpython-2.6.4.0 (01 Sep 2007)
+
+  01 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.6.4.0.ebuild:
+  Version bump. No major groundbreakery. Masked due to dep on
+  =x11-libs/wxGTK-2.6.4.0.
 
   07 May 2007; Bryan Østergaard <kloeri@gentoo.org>
   wxpython-2.6.3.3.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 3c2e9bbf6098..7750935daae9 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,14 +7,19 @@ MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265
 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 files/wxpy-config.py 3265
 SHA256 1097d2b169f3c97f149032f5f647e1920d89288dc91981ad85b2d3ae28baf8ef files/wxpy-config.py 3265
 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
 EBUILD wxpython-2.6.3.3.ebuild 3182 RMD160 2f215b9c9c7e579eb08d3b549960499aa1278e54 SHA1 dd2baa0e3885eb18581c0328d3e7881074502ff8 SHA256 571e1c5703e7ec3cc1d18b724e9da118e24423a2d9b87658eb2c546385fd754c
 MD5 93e2332e02b011e2504c933e2a245dbd wxpython-2.6.3.3.ebuild 3182
 RMD160 2f215b9c9c7e579eb08d3b549960499aa1278e54 wxpython-2.6.3.3.ebuild 3182
 SHA256 571e1c5703e7ec3cc1d18b724e9da118e24423a2d9b87658eb2c546385fd754c wxpython-2.6.3.3.ebuild 3182
-MISC ChangeLog 14226 RMD160 e7ffe87cf1e38afff62c231ef543fa7ac8f60428 SHA1 0c1a0665676a0102864226e888689588ecf85b31 SHA256 3b3d161de6b0a7dd07a256f21a2c4de7500e9caa0a0d9c9a27469f5973ea407a
-MD5 485397fc6644d62b77e61d2c2c87c96b ChangeLog 14226
-RMD160 e7ffe87cf1e38afff62c231ef543fa7ac8f60428 ChangeLog 14226
-SHA256 3b3d161de6b0a7dd07a256f21a2c4de7500e9caa0a0d9c9a27469f5973ea407a ChangeLog 14226
+EBUILD wxpython-2.6.4.0.ebuild 2747 RMD160 bc820ee4d88ea4f68356724552e6417e37bf8033 SHA1 caf14234fc92590474b5d4708deca357f539e0df SHA256 9f3969314dc7fffbec966dc14bcd59fcd45a85332dda33ffdf1c45c2162a7007
+MD5 058b737b676b5dd4d68029d9c76e971c wxpython-2.6.4.0.ebuild 2747
+RMD160 bc820ee4d88ea4f68356724552e6417e37bf8033 wxpython-2.6.4.0.ebuild 2747
+SHA256 9f3969314dc7fffbec966dc14bcd59fcd45a85332dda33ffdf1c45c2162a7007 wxpython-2.6.4.0.ebuild 2747
+MISC ChangeLog 14426 RMD160 676135feb29094bfca58de8bc81c6c6ec28c6377 SHA1 9856d07ed627f5778d96abe2cdb918c87dc4124c SHA256 720e32911ff6bbcf6caefed729fb2c9757dd955fee4100bad6062f47f55f0897
+MD5 a7fcf1e9e1fcc896332f0420bd41aa95 ChangeLog 14426
+RMD160 676135feb29094bfca58de8bc81c6c6ec28c6377 ChangeLog 14426
+SHA256 720e32911ff6bbcf6caefed729fb2c9757dd955fee4100bad6062f47f55f0897 ChangeLog 14426
 MISC metadata.xml 182 RMD160 ea41002477d2dd03185feb91318022c593ab267f SHA1 104f632f29e5a0bafbe01ab77d3565326054ab3b SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5
 MD5 f3c5a27935083d6431dbc3401b897b92 metadata.xml 182
 RMD160 ea41002477d2dd03185feb91318022c593ab267f metadata.xml 182
@@ -25,10 +27,6 @@ SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5 metadata
 MD5 4865b7c2ac0ec50eb4588b9c8782f5f9 files/digest-wxpython-2.6.3.3 271
 RMD160 bc71a86558bf3216ddd97ea35e83fd50fd934587 files/digest-wxpython-2.6.3.3 271
 SHA256 fd33053a2b85e0e330fff5bb181c0cd89d25c524f5ea2a6987e791480a83b814 files/digest-wxpython-2.6.3.3 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGPv+ZugEuf3OQ0akRAqguAJ9GUPtWc+xm2Is/1WqbK7wON7bdJQCeN32x
-4hxPX0VMJsvxTGUrdwPPocQ=
-=KU2R
------END PGP SIGNATURE-----
+MD5 f496654bafb9821890f407c13e4229de files/digest-wxpython-2.6.4.0 271
+RMD160 9814e2bef74890e3742b4454037db4ddf0b1ddb3 files/digest-wxpython-2.6.4.0 271
+SHA256 1404a03e99b28ea09a2469be3919e28da39a2f8a0fb8443b2cccc9ec43d0aade files/digest-wxpython-2.6.4.0 271
diff --git a/dev-python/wxpython/files/digest-wxpython-2.6.4.0 b/dev-python/wxpython/files/digest-wxpython-2.6.4.0
new file mode 100644
index 000000000000..503176f2a11d
--- /dev/null
+++ b/dev-python/wxpython/files/digest-wxpython-2.6.4.0
@@ -0,0 +1,3 @@
+MD5 489301bffcf845a0f810e41c1f571ff5 wxPython-src-2.6.4.0.tar.bz2 19062795
+RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 wxPython-src-2.6.4.0.tar.bz2 19062795
+SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba wxPython-src-2.6.4.0.tar.bz2 19062795
diff --git a/dev-python/wxpython/wxpython-2.6.4.0.ebuild b/dev-python/wxpython/wxpython-2.6.4.0.ebuild
new file mode 100644
index 000000000000..8586a432d05f
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.6.4.0.ebuild
@@ -0,0 +1,110 @@
+# 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.6.4.0.ebuild,v 1.1 2007/09/01 09:28:24 dirtyepic Exp $
+
+inherit python wxwidgets eutils multilib
+
+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.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="unicode opengl"
+
+RDEPEND=">=dev-lang/python-2.1
+	>=x11-libs/wxGTK-${PV}
+	>=x11-libs/gtk+-2.0
+	>=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/"
+
+WX_GTK_VER="2.6"
+
+pkg_setup() {
+	echo
+	use opengl && check_wxuse opengl
+	use unicode && check_wxuse unicode
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
+	epatch "${FILESDIR}"/scripts-multiver-2.6.1.0.diff
+}
+
+src_compile() {
+	local mypyconf
+	if use unicode; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
+	fi
+
+	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
+	use opengl \
+		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
+		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
+
+	mypyconf="${mypyconf} WXPORT=gtk2"
+
+	use unicode && mypyconf="${mypyconf} UNICODE=1"
+
+	python setup.py ${mypyconf} build || die "build failed"
+}
+
+src_install() {
+	python_version
+	local mypyconf
+	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"
+
+	use unicode && mypyconf="${mypyconf} UNICODE=1"
+
+	python setup.py ${mypyconf} install --prefix=/usr --root="${D}" || die
+
+	cp "${FILESDIR}"/wxpy-config.py "${D}"/${site_pkgs}/
+
+	#Add ${PV} suffix to all /usr/bin/* programs to avoid clobbering SLOT'd
+	for filename in "${D}"/usr/bin/* ; do
+		mv ${filename} ${filename}-2.6
+	done
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/
+
+	echo
+	elog "Gentoo now uses the Multi-version method for SLOT'ing"
+	elog "Developers see this site for instructions on using 2.4 or 2.6"
+	elog "with your apps:"
+	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
+	echo
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/
+}