diff options
| -rw-r--r-- | dev-python/pylibpcap/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/pylibpcap/files/pylibpcap-swig-1.3.29.patch | 57 | ||||
| -rw-r--r-- | dev-python/pylibpcap/files/pylibpcap-unknown_addr.patch | 13 | ||||
| -rw-r--r-- | dev-python/pylibpcap/pylibpcap-0.5.1.ebuild | 33 |
4 files changed, 6 insertions, 104 deletions
diff --git a/dev-python/pylibpcap/ChangeLog b/dev-python/pylibpcap/ChangeLog index 49997809bc7d..107364a6e7c4 100644 --- a/dev-python/pylibpcap/ChangeLog +++ b/dev-python/pylibpcap/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/pylibpcap # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/ChangeLog,v 1.23 2011/01/09 16:59:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/ChangeLog,v 1.24 2011/01/09 17:06:19 arfrever Exp $ + + 09 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + -pylibpcap-0.5.1.ebuild, -files/pylibpcap-swig-1.3.29.patch, + -files/pylibpcap-unknown_addr.patch: + Delete. 09 Jan 2011; Raúl Porcel <armin76@gentoo.org> pylibpcap-0.6.2.ebuild: ia64 stable wrt #350187 diff --git a/dev-python/pylibpcap/files/pylibpcap-swig-1.3.29.patch b/dev-python/pylibpcap/files/pylibpcap-swig-1.3.29.patch deleted file mode 100644 index aaec422c5c80..000000000000 --- a/dev-python/pylibpcap/files/pylibpcap-swig-1.3.29.patch +++ /dev/null @@ -1,57 +0,0 @@ -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/files/pylibpcap-unknown_addr.patch b/dev-python/pylibpcap/files/pylibpcap-unknown_addr.patch deleted file mode 100644 index babb4d0a1dc9..000000000000 --- a/dev-python/pylibpcap/files/pylibpcap-unknown_addr.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- pcap_interface.c.orig 2004-07-10 07:58:10.000000000 +0300 -+++ pcap_interface.c 2007-07-09 13:40:18.000000000 +0300 -@@ -513,9 +513,7 @@ - break; - #endif - default: -- fprintf(stderr, "at line %d\n", __LINE__); -- throw_exception(-1, "unsupported address family"); -- return NULL; -+ return PyString_FromFormat("<AF %d>", sa->sa_family); - case AF_UNSPEC: - Py_INCREF(Py_None); - return Py_None; diff --git a/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild b/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild deleted file mode 100644 index ea88d5ce582b..000000000000 --- a/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2008 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.9 2008/07/15 19:57:15 jer Exp $ - -inherit distutils eutils - -DESCRIPTION="Python interface to libpcap" -HOMEPAGE="http://sourceforge.net/projects/pylibpcap/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~hppa ia64 x86" -IUSE="examples" - -RDEPEND="virtual/libpcap" -DEPEND="${RDEPEND} - >=dev-lang/swig-1.3.29" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-swig-1.3.29.patch" - epatch "${FILESDIR}/${PN}-unknown_addr.patch" -} - -src_install() { - distutils_src_install - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} |