Version bump (bug #156805), fixes bugs #154505, #148399, #158050

(Portage version: 2.1.2_rc4-r1)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 138 deletions

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 737330520381..475134128183 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.0.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
 MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373
 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 files/scripts-multiver-2.6.0.0.diff 3373
@@ -18,7 +15,7 @@ MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404
 RMD160 d69feda3e74ca3cbd3777f13809495e374fc1189 files/wxversion.py 14404
 SHA256 24d63e045301a1c5e354e551c4500db9b656908f3243a5f292d7d1345f1a8f55 files/wxversion.py 14404
 DIST wxPython-src-2.6.1.0.tar.gz 18452406 RMD160 211b6bad3b9062180e67cf13e40c810b1e3fff9b SHA1 e7f46b0eb83fb0e316e0d5b49fd38b3b7f00b95b SHA256 cd4f03fcd1a9e8c27881414e83ceb66ce07ca9fe0d42292830a9f9894e4c4335
-DIST wxPython-src-2.6.3.2.tar.gz 18946956 RMD160 4fabaefa4c066d1cccc5301bdd31cda16a55647b SHA1 2f845459e089c615e15ac165b5135b688b9d62cf SHA256 21558bf3f306bb935b53e0ca42664ca325ec3cc4d9452b79bb5d9ff4b68aadb6
+DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60f3692eb783 SHA1 e55a3a8cfbd1aff394be15297ae205a8c597bed8 SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
 DIST wxPythonSrc-2.4.2.4.tar.gz 13130195
 EBUILD wxpython-2.4.2.4-r3.ebuild 3810 RMD160 37c8c535ee5b91feb3624a61ac77850917c0c467 SHA1 3fbac6942a9dd74e0e6d07fa8c7b5c87ce8ba75e SHA256 c30642363fae13abe2a407dce4367544fb41d78fee63d6532b1c206ec990c99d
 MD5 616a9a5bafa276de3059cc6a8fd98b9c wxpython-2.4.2.4-r3.ebuild 3810
@@ -28,14 +25,14 @@ EBUILD wxpython-2.6.1.0.ebuild 3799 RMD160 21174a37b98de635cd51669362b1d072bf7e8
 MD5 b7e08422f599125874b8a8b9e77139ef wxpython-2.6.1.0.ebuild 3799
 RMD160 21174a37b98de635cd51669362b1d072bf7e8fad wxpython-2.6.1.0.ebuild 3799
 SHA256 f126cc324972aa9bd5ff7e359153b46ca10bd472e8a954565d449e1baeab0a49 wxpython-2.6.1.0.ebuild 3799
-EBUILD wxpython-2.6.3.2.ebuild 3098 RMD160 1465e2dd5f9556814703e4c602ca5e5438fbd00f SHA1 ef8f5ec5ab8fa61dd2f9dc148f205f513630dad7 SHA256 9ef645d782ee5d9ab357cb7d7412e5b2b11145ace08b496d2666c80dfe3edf19
-MD5 cbd50d4169bc1bc5934bf1d6cb7012e0 wxpython-2.6.3.2.ebuild 3098
-RMD160 1465e2dd5f9556814703e4c602ca5e5438fbd00f wxpython-2.6.3.2.ebuild 3098
-SHA256 9ef645d782ee5d9ab357cb7d7412e5b2b11145ace08b496d2666c80dfe3edf19 wxpython-2.6.3.2.ebuild 3098
-MISC ChangeLog 12097 RMD160 86173d27fe7647d0777a6ee0a6d4091c42b98751 SHA1 4ffc534ccb13b8d5012b504923c9e5d3c9b58de3 SHA256 ae412b6152b3e990ad854aba88ba027c87fbe19487a844872ef78106bba346d4
-MD5 6abdb7274eff6bfc34fa75f44325c6f6 ChangeLog 12097
-RMD160 86173d27fe7647d0777a6ee0a6d4091c42b98751 ChangeLog 12097
-SHA256 ae412b6152b3e990ad854aba88ba027c87fbe19487a844872ef78106bba346d4 ChangeLog 12097
+EBUILD wxpython-2.6.3.3.ebuild 3101 RMD160 30f5685a19b78fea4fac8b4767b207a936293d45 SHA1 870ef4bf2f4472a9c5eee9b61ef615692b171d3c SHA256 59a8767931a5555f48d588f8d14e99d66890482adc36adf05bebe5f0898de906
+MD5 03e07f3c8e47365d17907e5e578fc01d wxpython-2.6.3.3.ebuild 3101
+RMD160 30f5685a19b78fea4fac8b4767b207a936293d45 wxpython-2.6.3.3.ebuild 3101
+SHA256 59a8767931a5555f48d588f8d14e99d66890482adc36adf05bebe5f0898de906 wxpython-2.6.3.3.ebuild 3101
+MISC ChangeLog 12309 RMD160 b088b3f686a542a5e8b5ee227a697ddccffa9bcd SHA1 15737743573cdb0a094e5fe3b089d16d030ce81e SHA256 bfeababf008f6e9a539235356d002f1b5828bcca58371dbb15a32bacce1137ed
+MD5 3e604bcf2db79c6f73cc480305a5a655 ChangeLog 12309
+RMD160 b088b3f686a542a5e8b5ee227a697ddccffa9bcd ChangeLog 12309
+SHA256 bfeababf008f6e9a539235356d002f1b5828bcca58371dbb15a32bacce1137ed ChangeLog 12309
 MISC metadata.xml 182 RMD160 ea41002477d2dd03185feb91318022c593ab267f SHA1 104f632f29e5a0bafbe01ab77d3565326054ab3b SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5
 MD5 f3c5a27935083d6431dbc3401b897b92 metadata.xml 182
 RMD160 ea41002477d2dd03185feb91318022c593ab267f metadata.xml 182
@@ -46,13 +43,6 @@ SHA256 97ebdc0443473d44a8a82049333188f2063074825a890143e7ac8fa10ad2ffe3 files/di
 MD5 fbbd2475bb624660159cd7d059b5114d files/digest-wxpython-2.6.1.0 268
 RMD160 bae16c6faa209219e21bce08c74d509650f31f18 files/digest-wxpython-2.6.1.0 268
 SHA256 9c471738678619dddb0569143f1f46d3d0ab92c4b1b8f5d76b69f3c5e9697b12 files/digest-wxpython-2.6.1.0 268
-MD5 f154a877dfb1ee91361196176dcfaa5b files/digest-wxpython-2.6.3.2 268
-RMD160 50c151bcd8e0f1a42b9adddd13263e094f7fe958 files/digest-wxpython-2.6.3.2 268
-SHA256 ec01ef53b8d527a2c26c2b1d8bbd1a3657cca61292f23b16304d2bc0af48f1b9 files/digest-wxpython-2.6.3.2 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFMc5PkeYb6olFHJcRAv9xAKCaqz7aKDJG17/LWGvPTfgvTjXsjgCeMfle
-RwmjDLZuy8VnX7JoX2LsdqY=
-=i7Q/
------END PGP SIGNATURE-----
+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
diff --git a/dev-python/wxpython/files/digest-wxpython-2.6.3.2 b/dev-python/wxpython/files/digest-wxpython-2.6.3.2
deleted file mode 100644
index 157d9c5d060c..000000000000
--- a/dev-python/wxpython/files/digest-wxpython-2.6.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a27546fab8a8d77eb6b67954e6362269 wxPython-src-2.6.3.2.tar.gz 18946956
-RMD160 4fabaefa4c066d1cccc5301bdd31cda16a55647b wxPython-src-2.6.3.2.tar.gz 18946956
-SHA256 21558bf3f306bb935b53e0ca42664ca325ec3cc4d9452b79bb5d9ff4b68aadb6 wxPython-src-2.6.3.2.tar.gz 18946956
diff --git a/dev-python/wxpython/wxpython-2.6.3.2.ebuild b/dev-python/wxpython/wxpython-2.6.3.2.ebuild
deleted file mode 100644
index bdb51b8fca70..000000000000
--- a/dev-python/wxpython/wxpython-2.6.3.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.2.ebuild,v 1.4 2006/09/06 21:26:16 the_paya 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.gz"
-
-LICENSE="wxWinLL-3"
-SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die "failed to cd to ${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
-	export WX_GTK_VER="2.6"
-	if use unicode; then
-		need-wxwidgets unicode || die "Please re-emerge wxGTK with unicode " \
-		"in USE"
-	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
-
-	if [ -e "${site_pkgs}/wx.pth" ] && [ "`grep -o 2.4 ${site_pkgs}/wx.pth`" = "2.4" ]; then
-		rm "${D}"/${site_pkgs}/wx.pth
-		einfo "Keeping 2.4 as system default wxPython"
-	else
-		if use unicode; then
-			wx_name=wx-${PV:0:3}-gtk2-unicode
-		else
-			wx_name=wx-${PV:0:3}-gtk2-ansi
-		fi
-
-		einfo "Setting ${wx_name} as system default wxPython"
-		echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \
-			die "Couldn't create wx.pth"
-
-	fi
-
-	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() {
-
-	einfo "Gentoo now uses the Multi-version method for SLOT'ing"
-	einfo "Developers see this site for instructions on using 2.4 or 2.6"
-	einfo "with your apps:"
-	einfo "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-	einfo "2.4 is still the default wxpython for now, but 2.6 apps should"
-	einfo "see the above website for selecting the 2.6 lib"
-}
-