Added pyzord_getopt.patch for better command line handling

Package-Manager: portage-2.1.3_rc6

4 files changed, 43 insertions, 10 deletions

diff --git a/dev-python/pyzor/ChangeLog b/dev-python/pyzor/ChangeLog
index 783918b7bcc1..fac8a8d5e536 100644
--- a/dev-python/pyzor/ChangeLog
+++ b/dev-python/pyzor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyzor
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/ChangeLog,v 1.35 2007/07/05 20:17:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/ChangeLog,v 1.36 2007/07/05 22:53:34 hawking Exp $
+
+  05 Jul 2007; Ali Polatel <hawking@gentoo.org> +files/pyzord_getopt.patch,
+  pyzor-0.4.0-r3.ebuild:
+  Added pyzord_getopt.patch for better command line handling.
 
   04 Jul 2007; Jeroen Roovers <jer@gentoo.org> pyzor-0.4.0-r3.ebuild:
   Stable for HPPA (bug #183892).
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index c8076b98f546..767954a97355 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -6,6 +6,10 @@ AUX handle_unknown_encodings.patch 3216 RMD160 94f8a758527669363c1c9f0dfc3315c3a
 MD5 82dccdcfa0df0b39e37c784a84c3d1a4 files/handle_unknown_encodings.patch 3216
 RMD160 94f8a758527669363c1c9f0dfc3315c3ac8410cc files/handle_unknown_encodings.patch 3216
 SHA256 fa5bb2fc15383ee17f6e4c9c90ec78ceac8260b8923887744a6ceedabbab4bd3 files/handle_unknown_encodings.patch 3216
+AUX pyzord_getopt.patch 640 RMD160 31e65c868032988cc42c4a6f7ca98efa0a0e6a12 SHA1 61754944886bc6138ba533fe51fdce1191dbaaa9 SHA256 6cc675c7caf935342c3728ef399c2ebdb57029d146903aa36593fa3a34f270a9
+MD5 beda38fa838533a484ce483a5732b3c8 files/pyzord_getopt.patch 640
+RMD160 31e65c868032988cc42c4a6f7ca98efa0a0e6a12 files/pyzord_getopt.patch 640
+SHA256 6cc675c7caf935342c3728ef399c2ebdb57029d146903aa36593fa3a34f270a9 files/pyzord_getopt.patch 640
 AUX unknown_type.patch 472 RMD160 e70885792a8d8bdd8e1265ae03703c8e7742e3ef SHA1 cc9a43265f87cc41f6bb2df7a35a800d9f30dc68 SHA256 e1d1a9134f0a4fc561e0a14bc657babbf94c5be46856b3273817cf233b30d060
 MD5 6e1a6983f5565656d563fb0d89bf45a9 files/unknown_type.patch 472
 RMD160 e70885792a8d8bdd8e1265ae03703c8e7742e3ef files/unknown_type.patch 472
@@ -15,14 +19,14 @@ EBUILD pyzor-0.4.0-r2.ebuild 1295 RMD160 0436eb3bec66f908f8192da599216f66211d472
 MD5 34d2a7b8955fa84d7d29f8f42e0ed5ca pyzor-0.4.0-r2.ebuild 1295
 RMD160 0436eb3bec66f908f8192da599216f66211d472c pyzor-0.4.0-r2.ebuild 1295
 SHA256 025b1f4080259ee8463ddc0564c8bf422128ef57cbe72098329d0d1a9b849ea7 pyzor-0.4.0-r2.ebuild 1295
-EBUILD pyzor-0.4.0-r3.ebuild 1470 RMD160 67c37ff15d9fb0a3a73be8a2de29549427d61dca SHA1 a1d5abcc7ea317f8f42146ab175ae6f926d0de09 SHA256 411c55d7683ed5af2680d6ad749222108770f35c0f477cbc885ec901491cf760
-MD5 7f2d6af3fa6d8d81c4d30844ee5b7322 pyzor-0.4.0-r3.ebuild 1470
-RMD160 67c37ff15d9fb0a3a73be8a2de29549427d61dca pyzor-0.4.0-r3.ebuild 1470
-SHA256 411c55d7683ed5af2680d6ad749222108770f35c0f477cbc885ec901491cf760 pyzor-0.4.0-r3.ebuild 1470
-MISC ChangeLog 3900 RMD160 c68cb19d542b2d995a6c72f081b682b8fe79985e SHA1 908df961a9758da7f3b75029f729b9549b2656dd SHA256 5c5f7e17d968bf4a0be780d514294db05ff0fd83888969f2815d75f4dc8105f9
-MD5 4316658630e7696d3fa83a94989a7c4b ChangeLog 3900
-RMD160 c68cb19d542b2d995a6c72f081b682b8fe79985e ChangeLog 3900
-SHA256 5c5f7e17d968bf4a0be780d514294db05ff0fd83888969f2815d75f4dc8105f9 ChangeLog 3900
+EBUILD pyzor-0.4.0-r3.ebuild 1513 RMD160 64c190b58df1e2af4b6b9b32f2ef531af9c5f9ef SHA1 2ab20a0c5cf2e4cfce41351aa5f46c4e391e8c77 SHA256 a719917a5e78334b34ac5f933f92c686114773f167eefe8b5fa084cebb29e7f4
+MD5 f2ec7dbb2f2893a7e1ad3eb41abd9885 pyzor-0.4.0-r3.ebuild 1513
+RMD160 64c190b58df1e2af4b6b9b32f2ef531af9c5f9ef pyzor-0.4.0-r3.ebuild 1513
+SHA256 a719917a5e78334b34ac5f933f92c686114773f167eefe8b5fa084cebb29e7f4 pyzor-0.4.0-r3.ebuild 1513
+MISC ChangeLog 4064 RMD160 01d712f27e8b596503f5897c4822d505a8bb89bf SHA1 6d4b82f43d1cac37433fc68cd98e464b0269809f SHA256 a9e5a33aa89e5d99990484731342dc65a9c6165387089ed7928885befd953924
+MD5 65eb639ac1d38b0d973a9c67bf0859c9 ChangeLog 4064
+RMD160 01d712f27e8b596503f5897c4822d505a8bb89bf ChangeLog 4064
+SHA256 a9e5a33aa89e5d99990484731342dc65a9c6165387089ed7928885befd953924 ChangeLog 4064
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
diff --git a/dev-python/pyzor/files/pyzord_getopt.patch b/dev-python/pyzor/files/pyzord_getopt.patch
new file mode 100644
index 000000000000..42b6fe4339f6
--- /dev/null
+++ b/dev-python/pyzor/files/pyzord_getopt.patch
@@ -0,0 +1,24 @@
+--- scripts/pyzord.orig	2002-09-08 06:33:44.000000000 +0300
++++ scripts/pyzord	2007-07-06 01:31:06.000000000 +0300
+@@ -52,7 +52,11 @@
+ # functions above, run below
+ 
+ debug = 0
+-(options, args) = getopt.getopt(sys.argv[1:], 'dh:', ['homedir='])
++try:
++    (options, args) = getopt.getopt(sys.argv[1:], 'hd', ['help','homedir='])
++except getopt.GetoptError, err:
++    print str(err)
++    usage()
+ if len(args) != 0:
+     usage()
+ 
+@@ -61,7 +65,7 @@
+ for (o, v) in options:
+     if o == '-d':
+         debug = 1
+-    elif o == '-h':
++    elif o in ('-h', '--help'):
+         usage()
+     elif o == '--homedir':
+         specified_homedir = v
diff --git a/dev-python/pyzor/pyzor-0.4.0-r3.ebuild b/dev-python/pyzor/pyzor-0.4.0-r3.ebuild
index 89a82d607020..78366e16b156 100644
--- a/dev-python/pyzor/pyzor-0.4.0-r3.ebuild
+++ b/dev-python/pyzor/pyzor-0.4.0-r3.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/pyzor/pyzor-0.4.0-r3.ebuild,v 1.9 2007/07/05 20:17:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-0.4.0-r3.ebuild,v 1.10 2007/07/05 22:53:34 hawking Exp $
 
 inherit distutils eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/debian_mbox.patch"
 	epatch "${FILESDIR}/handle_unknown_encodings.patch"
+	epatch "${FILESDIR}/pyzord_getopt.patch"
 	epatch "${FILESDIR}/unknown_type.patch"
 
 	# rfc822BodyCleanerTest doesn't work fine