Revbump. Added patch to prevent running against other SLOTs of wxpython, #201158. Drop old.

Package-Manager: portage-2.1.4_rc4

9 files changed, 47 insertions, 98 deletions

diff --git a/dev-python/drpython/ChangeLog b/dev-python/drpython/ChangeLog
index 20f1d82f85d3..c5b1228306c9 100644
--- a/dev-python/drpython/ChangeLog
+++ b/dev-python/drpython/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/drpython
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/ChangeLog,v 1.14 2007/11/20 06:45:45 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/ChangeLog,v 1.15 2007/12/04 07:51:55 hawking Exp $
+
+*drpython-165-r1 (04 Dec 2007)
+
+  04 Dec 2007; Ali Polatel <hawking@gentoo.org>
+  -files/drpython.py-3.10.12.patch, -files/drpython.py-3.10.13.patch,
+  +files/drpython-165-wxversion.patch, -drpython-164.ebuild,
+  -drpython-165.ebuild, +drpython-165-r1.ebuild:
+  Revbump. Added patch to prevent running against other SLOTs of wxpython,
+  #201158. Drop old.
 
 *drpython-165 (20 Nov 2007)
 
diff --git a/dev-python/drpython/Manifest b/dev-python/drpython/Manifest
index b8778f3732ea..0141c45cd478 100644
--- a/dev-python/drpython/Manifest
+++ b/dev-python/drpython/Manifest
@@ -1,42 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX drpython.py-3.10.12.patch 370 RMD160 c45064437baffbb7b641e305fb0e76841a4b88c4 SHA1 1c2bb36a6017fa490c5981670db279d82af956ec SHA256 64638ab22115d229e470056aaed5efe3f1744326caed7beefeadad3415258afb
-MD5 8f97fad63e509cc0537b92bedec9c731 files/drpython.py-3.10.12.patch 370
-RMD160 c45064437baffbb7b641e305fb0e76841a4b88c4 files/drpython.py-3.10.12.patch 370
-SHA256 64638ab22115d229e470056aaed5efe3f1744326caed7beefeadad3415258afb files/drpython.py-3.10.12.patch 370
-AUX drpython.py-3.10.13.patch 370 RMD160 c45064437baffbb7b641e305fb0e76841a4b88c4 SHA1 1c2bb36a6017fa490c5981670db279d82af956ec SHA256 64638ab22115d229e470056aaed5efe3f1744326caed7beefeadad3415258afb
-MD5 8f97fad63e509cc0537b92bedec9c731 files/drpython.py-3.10.13.patch 370
-RMD160 c45064437baffbb7b641e305fb0e76841a4b88c4 files/drpython.py-3.10.13.patch 370
-SHA256 64638ab22115d229e470056aaed5efe3f1744326caed7beefeadad3415258afb files/drpython.py-3.10.13.patch 370
-DIST drpython164.zip 590273 RMD160 adc6e633f7ab2235cddbcab5b990bda457f5ca73 SHA1 e1860c73491e4ce845bea0417e320472a70fa60c SHA256 f154285e5b341e2887883efd858275952568e09e0f71e35b699707c09f21a934
+AUX drpython-165-wxversion.patch 385 RMD160 78b41d6ad1af3c454a946cf036e637c5f0aa6ac1 SHA1 33b6da7eafc3fdf76cdc0bf6546e354e20366930 SHA256 99fa009e880d2c5252a51fccf97bc3e9ec6bf2ba00c301810916a5f956450442
+MD5 77845ef8acb4adc7342c12626f250006 files/drpython-165-wxversion.patch 385
+RMD160 78b41d6ad1af3c454a946cf036e637c5f0aa6ac1 files/drpython-165-wxversion.patch 385
+SHA256 99fa009e880d2c5252a51fccf97bc3e9ec6bf2ba00c301810916a5f956450442 files/drpython-165-wxversion.patch 385
 DIST drpython165.zip 597435 RMD160 cd6669848b121e54304d591008e8fa9475b9d5fb SHA1 069d0424dbe8df3ee34fce921f69e4fad6563629 SHA256 53e081a04962303b820d4cd956fdc83b4b475a217b5e2e22e99988644fe8eace
-EBUILD drpython-164.ebuild 1060 RMD160 2d3901af4e58fb8be09f9292425ee971d0b9fb61 SHA1 1684f740461677cc8f00dfeb3a5749c0a09976b9 SHA256 3254f562d46df6683663461b73e094e5231b98b1fa83392256042f1ad100dcf8
-MD5 2f256c8b0c7d9caaaaf0803caf86421b drpython-164.ebuild 1060
-RMD160 2d3901af4e58fb8be09f9292425ee971d0b9fb61 drpython-164.ebuild 1060
-SHA256 3254f562d46df6683663461b73e094e5231b98b1fa83392256042f1ad100dcf8 drpython-164.ebuild 1060
-EBUILD drpython-165.ebuild 1082 RMD160 45bb6f5eb42880e655577a3c7f0f9ccc9f47ecae SHA1 c7bbc46acfdd4b162cfa90e511570dd555ec0fe7 SHA256 de6f276035682d003d0389e54ae16406ddbd2e2128f8ce92c9f2e6dfa338fb73
-MD5 2d4c55f829d847ea5cf019ee01401a53 drpython-165.ebuild 1082
-RMD160 45bb6f5eb42880e655577a3c7f0f9ccc9f47ecae drpython-165.ebuild 1082
-SHA256 de6f276035682d003d0389e54ae16406ddbd2e2128f8ce92c9f2e6dfa338fb73 drpython-165.ebuild 1082
-MISC ChangeLog 2381 RMD160 33ad1fdb2b955baf0f0d2444037e04a9e1a51da9 SHA1 044fb0829533c019a20cf0318a17b1221057dd29 SHA256 2399cb9d93a85c598ba5662c1ee28e1a69e6642c36319e7d6c0e2a4d92a2d68c
-MD5 fc44b04afcffcd5b6bb717f8f1943145 ChangeLog 2381
-RMD160 33ad1fdb2b955baf0f0d2444037e04a9e1a51da9 ChangeLog 2381
-SHA256 2399cb9d93a85c598ba5662c1ee28e1a69e6642c36319e7d6c0e2a4d92a2d68c ChangeLog 2381
+EBUILD drpython-165-r1.ebuild 1173 RMD160 713023ae3f6e813aea6247561aaca4cbb21cbe63 SHA1 28c0e6ed4b9bf61680c07261459b9607081ed69b SHA256 3e938a45922cda0c95764d6404e7a8fb35b9e8470174f7b6ba58aff9e9cf9656
+MD5 663f3e0cc9313a6e87912d44749e53f5 drpython-165-r1.ebuild 1173
+RMD160 713023ae3f6e813aea6247561aaca4cbb21cbe63 drpython-165-r1.ebuild 1173
+SHA256 3e938a45922cda0c95764d6404e7a8fb35b9e8470174f7b6ba58aff9e9cf9656 drpython-165-r1.ebuild 1173
+MISC ChangeLog 2738 RMD160 595b14e244849c3b10566619cf22e4b9be9ef9f8 SHA1 f6aa8a9cf4ab70df0b861a0d23439bc0b8246c3a SHA256 e6c802861d041ad883804c51c43810ad4c793dbfb9bc2e55c598017f466cf48f
+MD5 1444aa17c86eeb2ca765f0cb357b6332 ChangeLog 2738
+RMD160 595b14e244849c3b10566619cf22e4b9be9ef9f8 ChangeLog 2738
+SHA256 e6c802861d041ad883804c51c43810ad4c793dbfb9bc2e55c598017f466cf48f ChangeLog 2738
 MISC metadata.xml 616 RMD160 55d32aae74924cd293b2c87b126506ee696aa947 SHA1 26735d0c74bc7033987b8d722fe38261977696f5 SHA256 c40683b55039fafad9ee14c549b3ec4cbcaca6d52b966d884666b0e2becd4744
 MD5 88f55e5d86d6886a75b1f13c95e3c8a2 metadata.xml 616
 RMD160 55d32aae74924cd293b2c87b126506ee696aa947 metadata.xml 616
 SHA256 c40683b55039fafad9ee14c549b3ec4cbcaca6d52b966d884666b0e2becd4744 metadata.xml 616
-MD5 2a9cb6c836ac47de9ed012ca922ee970 files/digest-drpython-164 226
-RMD160 1cf15e4446205bf0bf241df9607d945b70c31334 files/digest-drpython-164 226
-SHA256 503974fd3308979113de7c2499482fe392952263fe19d038ce7d7c3c97ded70e files/digest-drpython-164 226
-MD5 ba869c26724b278f81214b55623cea5f files/digest-drpython-165 226
-RMD160 aaae7e75e002f3467ba6509dcba5a01038cb5417 files/digest-drpython-165 226
-SHA256 88965b27acded572b20f2ebc1d7c8108916a583c8d46618e7c1acb022d5892f3 files/digest-drpython-165 226
+MD5 ba869c26724b278f81214b55623cea5f files/digest-drpython-165-r1 226
+RMD160 aaae7e75e002f3467ba6509dcba5a01038cb5417 files/digest-drpython-165-r1 226
+SHA256 88965b27acded572b20f2ebc1d7c8108916a583c8d46618e7c1acb022d5892f3 files/digest-drpython-165-r1 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFHQoKfQU4yORhF8iARAn67AJ4r9dYu3gk8hjlKXkUAeU7Y43jLRACgnJke
-gvii1yW7qPFPGtcgDk+eRT4=
-=dtcf
+iD8DBQFHVQciQU4yORhF8iARAkqtAJ9PkNE81VxPii/8RfQjh4bX8QqA4QCcCGy1
+d3qZnEmZKjKfIe9AQBnDEms=
+=+gGm
 -----END PGP SIGNATURE-----
diff --git a/dev-python/drpython/drpython-164.ebuild b/dev-python/drpython/drpython-164.ebuild
deleted file mode 100644
index b86490d318c1..000000000000
--- a/dev-python/drpython/drpython-164.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-164.ebuild,v 1.3 2007/10/03 04:48:15 dirtyepic Exp $
-
-inherit distutils eutils multilib
-
-DESCRIPTION="A powerful cross-platform IDE for Python"
-HOMEPAGE="http://drpython.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="=dev-python/wxpython-2.6*"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	distutils_python_version
-
-	local destdir="/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/"
-	dodir  ${destdir}/bitmaps/{16,24}
-	cp -R bitmaps "${D}"/${destdir} || die "Failed to cp bitmaps"
-
-	distutils_src_install
-
-	#Windows-only setup script:
-	rm "${D}"/usr/bin/postinst.py
-
-	make_wrapper drpython "python ${destdir}drpython.py"
-}
-
-pkg_postinst() {
-	elog "See the DrPython homepage for 20+ available plugins:"
-	elog "http://sourceforge.net/project/showfiles.php?group_id=83074"
-}
diff --git a/dev-python/drpython/drpython-165.ebuild b/dev-python/drpython/drpython-165-r1.ebuild
index db73b2c1391a..705ea960faab 100644
--- a/dev-python/drpython/drpython-165.ebuild
+++ b/dev-python/drpython/drpython-165-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-165.ebuild,v 1.1 2007/11/20 06:45:45 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-165-r1.ebuild,v 1.1 2007/12/04 07:51:55 hawking Exp $
 
 inherit distutils eutils multilib
 
@@ -17,6 +17,11 @@ DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${PN}
 
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${P}-wxversion.patch
+}
+
 src_install() {
 	distutils_python_version
 
@@ -29,7 +34,7 @@ src_install() {
 	#Windows-only setup script:
 	rm "${D}"/usr/bin/postinst.py
 
-	make_wrapper drpython "python ${destdir}drpython.py"
+	make_wrapper drpython "python ${destdir}drpython_wx26.py"
 }
 
 pkg_postinst() {
diff --git a/dev-python/drpython/files/digest-drpython-164 b/dev-python/drpython/files/digest-drpython-164
deleted file mode 100644
index be43b489a73b..000000000000
--- a/dev-python/drpython/files/digest-drpython-164
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a4793649d84b511bd065a2d4b231caf8 drpython164.zip 590273
-RMD160 adc6e633f7ab2235cddbcab5b990bda457f5ca73 drpython164.zip 590273
-SHA256 f154285e5b341e2887883efd858275952568e09e0f71e35b699707c09f21a934 drpython164.zip 590273
diff --git a/dev-python/drpython/files/digest-drpython-165 b/dev-python/drpython/files/digest-drpython-165-r1
index ab2c89a355b9..ab2c89a355b9 100644
--- a/dev-python/drpython/files/digest-drpython-165
+++ b/dev-python/drpython/files/digest-drpython-165-r1
diff --git a/dev-python/drpython/files/drpython-165-wxversion.patch b/dev-python/drpython/files/drpython-165-wxversion.patch
new file mode 100644
index 000000000000..5fb798805c3c
--- /dev/null
+++ b/dev-python/drpython/files/drpython-165-wxversion.patch
@@ -0,0 +1,12 @@
+diff -Naur drpython-orig/drpython_wx26.py drpython/drpython_wx26.py
+--- drpython-orig/drpython_wx26.py	2007-03-23 19:20:02.000000000 -0600
++++ drpython/drpython_wx26.py	2007-12-03 18:36:01.000000000 -0600
+@@ -34,7 +34,7 @@
+ 
+ ## testfile for older version
+ import wxversion
+-wxversion.select("2.60-msw-ansi")
++wxversion.select("2.6")
+ 
+ if __name__ == '__main__':
+     import drpython
diff --git a/dev-python/drpython/files/drpython.py-3.10.12.patch b/dev-python/drpython/files/drpython.py-3.10.12.patch
deleted file mode 100644
index 3eda05f5104e..000000000000
--- a/dev-python/drpython/files/drpython.py-3.10.12.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- orig.drpython.py	2004-11-08 19:36:14.000000000 -0800
-+++ drpython.py	2004-11-12 20:38:24.414029432 -0800
-@@ -42,6 +42,9 @@
-
- #franz: stat is not used
- import os.path, sys, os, shutil, re, string, traceback
-+# gentoo wx selection (next two lines)
-+import wxversion
-+wxversion.select("2.6")
- import wx, wx.stc
- import drScrolledMessageDialog
- from drNotebook import *
diff --git a/dev-python/drpython/files/drpython.py-3.10.13.patch b/dev-python/drpython/files/drpython.py-3.10.13.patch
deleted file mode 100644
index 3eda05f5104e..000000000000
--- a/dev-python/drpython/files/drpython.py-3.10.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- orig.drpython.py	2004-11-08 19:36:14.000000000 -0800
-+++ drpython.py	2004-11-12 20:38:24.414029432 -0800
-@@ -42,6 +42,9 @@
-
- #franz: stat is not used
- import os.path, sys, os, shutil, re, string, traceback
-+# gentoo wx selection (next two lines)
-+import wxversion
-+wxversion.select("2.6")
- import wx, wx.stc
- import drScrolledMessageDialog
- from drNotebook import *