add a conditional patch for swig-1.3.29. thanks to Ali Polatel. (#134343)

Package-Manager: portage-2.1.1

5 files changed, 106 insertions, 23 deletions

diff --git a/dev-python/pylibpcap/ChangeLog b/dev-python/pylibpcap/ChangeLog
index 79adbf172e06..b2dae6c96306 100644
--- a/dev-python/pylibpcap/ChangeLog
+++ b/dev-python/pylibpcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pylibpcap
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/ChangeLog,v 1.10 2006/04/01 15:24:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/ChangeLog,v 1.11 2006/09/19 20:58:21 liquidx Exp $
+
+  19 Sep 2006; Alastair Tse <liquidx@gentoo.org>
+  +files/pylibpcap-swig-1.3.29.patch, pylibpcap-0.5.1.ebuild:
+  add a conditional patch for swig-1.3.29. thanks to Ali Polatel. (#134343)
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org> pylibpcap-0.5.1.ebuild:
   Mark 0.5.1 ~ia64
diff --git a/dev-python/pylibpcap/Manifest b/dev-python/pylibpcap/Manifest
index b4ace2f827f1..c0a4677b0b72 100644
--- a/dev-python/pylibpcap/Manifest
+++ b/dev-python/pylibpcap/Manifest
@@ -1,31 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 22f46c2ba98d39d9cf5ed4a4c5f4a072 ChangeLog 1273
-RMD160 694e362436777c3c7ec8091ba7e406debbb1312c ChangeLog 1273
-SHA256 1616397cac08d7a487445d724ce9e97a740f78b7c4cf4fc8ff2fc0e2c240498d ChangeLog 1273
+AUX 0.4-swig.patch 423 RMD160 8b60b3d78e15fe807824c4180fb4fdf05e757594 SHA1 d6b1523bc1b0a0a1d005c864229d621fc41b4f07 SHA256 214bb28cba2d2da1e925df9f26e009adc73f21867c0fde021bd01ce8f9ca4b85
 MD5 9aaf9fc9de75199bc7959bd72e723b83 files/0.4-swig.patch 423
 RMD160 8b60b3d78e15fe807824c4180fb4fdf05e757594 files/0.4-swig.patch 423
 SHA256 214bb28cba2d2da1e925df9f26e009adc73f21867c0fde021bd01ce8f9ca4b85 files/0.4-swig.patch 423
-MD5 7f72dd0e8422b038631633864940cd56 files/digest-pylibpcap-0.4 64
-RMD160 1eb615a8dd00e4f9643b663067ffbcc1b0b69872 files/digest-pylibpcap-0.4 64
-SHA256 936b2bf47446ca799be3e88663fcfa9af78fe79dab40b0d20edcc686d2a24f29 files/digest-pylibpcap-0.4 64
-MD5 4465e8717c4517331dac28d6e80e775c files/digest-pylibpcap-0.5.1 66
-RMD160 c8f1c118015245eff76de4742396bc41b6f6ef98 files/digest-pylibpcap-0.5.1 66
-SHA256 5d104933f1dacd01226a27f463f7c22cdbb37c3fb4324810c7829545287d2e19 files/digest-pylibpcap-0.5.1 66
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
-SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
+AUX pylibpcap-swig-1.3.29.patch 2043 RMD160 4d2be282f3b3bfe9074fa74a358cb37f54bdb824 SHA1 49bf91699d5dec664b8016c5fb99c4fe6597ea8e SHA256 9e5a135693db8fab47c52281cc5d6627d785b3023a3d07099cf1f5502fce3624
+MD5 22cabbd0269b6969baf6fc5f827894db files/pylibpcap-swig-1.3.29.patch 2043
+RMD160 4d2be282f3b3bfe9074fa74a358cb37f54bdb824 files/pylibpcap-swig-1.3.29.patch 2043
+SHA256 9e5a135693db8fab47c52281cc5d6627d785b3023a3d07099cf1f5502fce3624 files/pylibpcap-swig-1.3.29.patch 2043
+DIST pylibpcap-0.4.tar.gz 19370
+DIST pylibpcap-0.5.1.tar.gz 25171 RMD160 f1e2309fbaf0878e6b4fb87b626686377c6c105a SHA1 c8e85258b3b3f79d629531856cfb3242c07f5796 SHA256 4b7eb79d5e476cc0e03bcdb13c4a874cf7edac650ef55a21fde385d676e3a7dd
+EBUILD pylibpcap-0.4.ebuild 664 RMD160 f52fff8670a91c5362daca68693091325f700d5c SHA1 502c74daf76704d54eabc2d95e09031bdebc4338 SHA256 ba852db1f544b54889f88d7c09f607c7b1bdb9a2ad1fdb78d90fbc4606cac5b4
 MD5 c832a62d36b3094e1011db92885d4527 pylibpcap-0.4.ebuild 664
 RMD160 f52fff8670a91c5362daca68693091325f700d5c pylibpcap-0.4.ebuild 664
 SHA256 ba852db1f544b54889f88d7c09f607c7b1bdb9a2ad1fdb78d90fbc4606cac5b4 pylibpcap-0.4.ebuild 664
-MD5 b56603bcebe415b52c0affd5dff971ff pylibpcap-0.5.1.ebuild 590
-RMD160 7b6c351987a66d81de1b33f3c19114ec6a69f202 pylibpcap-0.5.1.ebuild 590
-SHA256 29ebc61cb148b329ebc3832cb274a9823573ccee5c0561d20926808a74d79dc1 pylibpcap-0.5.1.ebuild 590
+EBUILD pylibpcap-0.5.1.ebuild 749 RMD160 997f2b6be3815225ddf2ba447473e67e82620a3b SHA1 427507e9159705eaf1a4c2404be38b74d2697dc3 SHA256 9c1eeb64e55b92325b9e85f100f045f1394432055218abccf1ad0a5928d48886
+MD5 8bf9d531ea0f996a494642c44eb65d8b pylibpcap-0.5.1.ebuild 749
+RMD160 997f2b6be3815225ddf2ba447473e67e82620a3b pylibpcap-0.5.1.ebuild 749
+SHA256 9c1eeb64e55b92325b9e85f100f045f1394432055218abccf1ad0a5928d48886 pylibpcap-0.5.1.ebuild 749
+MISC ChangeLog 1460 RMD160 3686fbaf49fe117fd3d34be2bc30fe6035905853 SHA1 8a1729f62c1303255833afb2f26a67df5543be89 SHA256 a3fdca9a1ecb8e65b75b4913c8b4e62c0f5f4465de48560e48d64919711f33a5
+MD5 551e795a22c31286a04574abf1abfb2e ChangeLog 1460
+RMD160 3686fbaf49fe117fd3d34be2bc30fe6035905853 ChangeLog 1460
+SHA256 a3fdca9a1ecb8e65b75b4913c8b4e62c0f5f4465de48560e48d64919711f33a5 ChangeLog 1460
+MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
+SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
+MD5 7f72dd0e8422b038631633864940cd56 files/digest-pylibpcap-0.4 64
+RMD160 1eb615a8dd00e4f9643b663067ffbcc1b0b69872 files/digest-pylibpcap-0.4 64
+SHA256 936b2bf47446ca799be3e88663fcfa9af78fe79dab40b0d20edcc686d2a24f29 files/digest-pylibpcap-0.4 64
+MD5 3cb431235dc6862ab9357d5b633d483d files/digest-pylibpcap-0.5.1 244
+RMD160 ac03f8a9f24bef1e3c94af45a512dcabc581823d files/digest-pylibpcap-0.5.1 244
+SHA256 2ada65d5356b9404c106bc2c87782e358fc8e8e42d9fa675db8970e9d4857cf5 files/digest-pylibpcap-0.5.1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFELpskJrHF4yAQTrARAg8zAKCJlINXwDS273L0a1iz7TCJ6lpy8gCfQQla
-rMMqlwt8Skw11PKIiJxzlOY=
-=yZRR
+iD8DBQFFEFn6uB6ZT1m7QRERAv0gAKCtKR+9R+Epb2ktRmem2XWnpppTawCg1O5a
+v+A+D1rXV6foa8Sn2VQG8bQ=
+=0lOj
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pylibpcap/files/digest-pylibpcap-0.5.1 b/dev-python/pylibpcap/files/digest-pylibpcap-0.5.1
index 99bd21d6c5f8..d411232aa66e 100644
--- a/dev-python/pylibpcap/files/digest-pylibpcap-0.5.1
+++ b/dev-python/pylibpcap/files/digest-pylibpcap-0.5.1
@@ -1 +1,3 @@
 MD5 85adbefd87be3a3a32bed899974fe3dc pylibpcap-0.5.1.tar.gz 25171
+RMD160 f1e2309fbaf0878e6b4fb87b626686377c6c105a pylibpcap-0.5.1.tar.gz 25171
+SHA256 4b7eb79d5e476cc0e03bcdb13c4a874cf7edac650ef55a21fde385d676e3a7dd pylibpcap-0.5.1.tar.gz 25171
diff --git a/dev-python/pylibpcap/files/pylibpcap-swig-1.3.29.patch b/dev-python/pylibpcap/files/pylibpcap-swig-1.3.29.patch
new file mode 100644
index 000000000000..aaec422c5c80
--- /dev/null
+++ b/dev-python/pylibpcap/files/pylibpcap-swig-1.3.29.patch
@@ -0,0 +1,57 @@
+diff -ur pylibpcap-0.5.1/build-tools/docify-shadow.py pylibpcap-0.5.1-fixed/build-tools/docify-shadow.py
+--- pylibpcap-0.5.1/build-tools/docify-shadow.py	2005-11-18 08:38:13.000000000 +0200
++++ pylibpcap-0.5.1-fixed/build-tools/docify-shadow.py	2006-09-14 02:03:41.000000000 +0300
+@@ -20,7 +20,7 @@
+ data=f.readlines()
+ 
+ for i in xrange(0,len(data)):
+-  match=re.search('^.*def __del__',data[i])
++  match=re.search('^.*__repr__ =',data[i]) # Changed from '^.*def __del__' to '__repr__ ='
+   if match:
+     #print match.group(0)
+     i=i+1
+@@ -36,7 +36,7 @@
+ 
+ pymeths=[]
+ for i in xrange (i,len(data)):
+-  if re.search('^.*def __repr__', data[i]):
++  if re.search('^.__del__ =', data[i]): # changed from ^.*def __repr__ to '^.*__del ='
+     break
+   pymeths.append(data[i])
+ 
+@@ -67,10 +67,16 @@
+     break
+ 
+ # spit out the next 2 lines verbatim
++# that's three lines:
++# this = _pcap.new_pcapObject(*args)
++# try: self.this.append(this)
++# except: self.this = this
+ outfile.write(data[i])
+-i=i+1
++i+=1
+ outfile.write(data[i])
+-i=i+1
++i+=1
++outfile.write(data[i])
++i+=1
+ 
+ outfile.write('        import sys\n')
+ outfile.write('        if sys.version[0]==\'2\':\n')
+diff -ur pylibpcap-0.5.1/mk-constants.py pylibpcap-0.5.1-fixed/mk-constants.py
+--- pylibpcap-0.5.1/mk-constants.py	2004-06-07 08:34:49.000000000 +0300
++++ pylibpcap-0.5.1-fixed/mk-constants.py	2006-09-14 01:55:14.000000000 +0300
+@@ -79,6 +79,13 @@
+ rcs = '   $Id: pylibpcap-swig-1.3.29.patch,v 1.1 2006/09/19 20:58:22 liquidx Exp $\n'
+ fp.write(string.replace(rcs, '$', ''))
+ fp.write('   Do not edit this file directly, it will be overwritten \n*/\n\n')
++fp.write('// Adding statements taken from pylibpcap-0.4 source\n')
++fp.write('#define SWIG_PY_INT\t1\n')
++fp.write('#define SWIG_PY_FLOAT\t2\n')
++fp.write('#define SWIG_PY_STRING\t3\n')
++fp.write('#define SWIG_PY_POINTER\t4\n')
++fp.write('#define SWIG_PY_BINARY\t5\n')
++fp.write('//\n')
+ fp.write('static struct swig_const_info const pcapmodule_DLT[] = {\n')
+ for dlt in linktypes:
+     fp.write('#ifdef %s\n' % (dlt,))
diff --git a/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild b/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild
index 75ec79ff0a35..b259fd858955 100644
--- a/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild
+++ b/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild,v 1.2 2006/04/01 15:24:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild,v 1.3 2006/09/19 20:58:21 liquidx Exp $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Python interface to libpcap"
 HOMEPAGE="http://sourceforge.net/projects/${PN}/"
@@ -14,7 +14,16 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE=""
 
 DEPEND="virtual/python
-	virtual/libpcap"
+	virtual/libpcap
+	dev-lang/swig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if $(has_version \>=dev-lang/swig-1.3.29); then
+		epatch ${FILESDIR}/${PN}-swig-1.3.29.patch
+	fi
+}
 
 src_install() {
 	distutils_src_install