Fix building with net-libs/libpcap[-static-libs] (bug #397647). Patch by Arfrever

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/dev-python/pypcap/ChangeLog b/dev-python/pypcap/ChangeLog
index c1fda30d3e6c7f982d4d24c56c650a6f3f7e27e4..04a7f1ec03633c8f3e634946598b8bd4370cd2f7 100644 (file)
--- a/dev-python/pypcap/ChangeLog
+++ b/dev-python/pypcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pypcap
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/ChangeLog,v 1.9 2011/04/02 12:47:36 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/ChangeLog,v 1.10 2012/01/08 21:13:07 hwoarang Exp $
+
+  08 Jan 2012; Markos Chandras <hwoarang@gentoo.org> pypcap-1.1-r1.ebuild:
+  Fix building with net-libs/libpcap[-static-libs] (bug #397647). Patch by
+  Arfrever
 
   02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> pypcap-1.1-r1.ebuild:
   Use net-libs/libpcap instead of virtual/libpcap wrt #358835.

diff --git a/dev-python/pypcap/Manifest b/dev-python/pypcap/Manifest
index d74bca254c7d86a12acf5f941deaa271a318651a..747c0ebb8364be0b94fe42456c949d9300326152 100644 (file)
--- a/dev-python/pypcap/Manifest
+++ b/dev-python/pypcap/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX include_path.patch 614 RMD160 4ddc3a915c7fba5cbb72aa7ccb3d3c567073d06e SHA1 11ee6d4db5faa8f1fe67f363c32d91c18e3c88ca SHA256 945ca669fe3478b9994241750a28cb6e94f7da466d05f42baef59715fcacb2af
 DIST pypcap-1.1.tar.gz 22951 RMD160 119dcc393d42678e6fa8f0b0f8b82536ab1efb13 SHA1 966f62deca16d5086e2ef6694b0c795f273da15c SHA256 087677295c795f543fad2c286df1807d55876e85d04f7292335cd149f4d8d47f
-EBUILD pypcap-1.1-r1.ebuild 1579 RMD160 ddedff0557a26ff02252eb1ac580cc11f1daacc9 SHA1 d626699ce162bf4109fe714899c3c21674e32a39 SHA256 c3b8693d11179cc3a94e0c867a2885b712060f4fa9c2ff6efa0b0bb0cb604cb0
-MISC ChangeLog 1401 RMD160 1ee4befe175c72b5d393b305fbeced95a8fb317f SHA1 28e4c332fad79c85b93a4baeb381f6cd0cac4a99 SHA256 7a02fa2f5ba106e34ca9a9dc1334f346d8c5122b581dab8a89cca899702c9179
+EBUILD pypcap-1.1-r1.ebuild 1713 RMD160 221f7c1d58de8f1eb884af48a5dba564b0d0a5de SHA1 558369077951a49ddcb4ca19c0a922d0802ec477 SHA256 246b25df50093351dc7bbd10129a9447184c653e4193739b896c2c0cd2e02c81
+MISC ChangeLog 1563 RMD160 bb34a6a43742dc4a753303c29736a66564753d70 SHA1 917afacb1f946daa563bdda16d6b2be24d351653 SHA256 707e86f02ae36c1e97ed70b3271547855da0dee92830dee10bd892caf76899d8
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2XGywACgkQXkR9YqOcLPEDcQEAkVxDHcQidtDPuFRdRLY0ah79
-EPZUW4pJw863uY2k0qkBAIgqgYtqd9u2Q9pXHG/NNS5rQH1KQ94rmhJG+LMuzbma
-=LSSy
+iQIcBAEBCgAGBQJPCgbjAAoJEPqDWhW0r/LCT0QQAMPLU53JqDvtrU/9bRIUQfrK
+YMmGuXwk2bUR/1Zv++El8UtjL6Z92qYCo/BmNuLhomRQ3q1tYRbOiVhu09UrBPqZ
+5OVuwQmEnBobjAWm3c1GTXzL1Umr7XxQmwY2m4y4ROrxDHotwDRtt9+YyXSyH/By
+Mh4s/AQEbte6+k39ZCVeFwpD4t/5A5It58+4/dthHAukHmA25rTeIiymlE6nUpRF
+KWf7GmCj1LmNYL+PuS/VlALmx3AQgfq3OCQlP2Ap2849mbIT8rOXUKGSXaEmtvYc
+z2aDDM9j6h1Ahg6vMCpfTJ5dBzZa60q5qSd+EoKp4rCgb91fKMMRPk06zUUSEJkT
+aB8/bTf3Py/KG2FYVpxOd2K6bq0OefG9MbvQ7MSKnSWaFV238352fbsR6LsPaRMi
+gTFkIbm8Cj1/Btb9CFzt5qHZC7ZD7zTPxTTIDMXYOAPsxJMgM9H5lYHsCWrTeVP4
++C7/R0L23oqJPXJCMUtf3Y2zEVQJeMHrGa7MYJBppaKeuJIoyMgva2lQGHOMPXXo
+ut0oKPewJ7Ec6p2fjhbQ6SP9nHYXXa16AjG1O97x7LsZ6rB7vvD1TcuqC11J30yd
+iC8b1xCsA59vR5G9ccW23BTyEucGHj5ut7rl5aCCOqfnoIAp2sNY1UhNbsINueSJ
+mjxRLRH57eMcTFzCH4on
+=MEjv
 -----END PGP SIGNATURE-----

diff --git a/dev-python/pypcap/pypcap-1.1-r1.ebuild b/dev-python/pypcap/pypcap-1.1-r1.ebuild
index 24b48c95d983f838e3ae957def897649976b5d9c..1680cfa70949a9be1296bd0e01d964ca9a77dee9 100644 (file)
--- a/dev-python/pypcap/pypcap-1.1-r1.ebuild
+++ b/dev-python/pypcap/pypcap-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/pypcap-1.1-r1.ebuild,v 1.5 2011/04/02 12:47:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/pypcap-1.1-r1.ebuild,v 1.6 2012/01/08 21:13:07 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -33,6 +33,9 @@ src_prepare() {
 
        epatch "${FILESDIR}/include_path.patch"
 
+       # Check existence of shared library instead of static library.
+       sed -e "s/'libpcap.a'/'libpcap.so'/" -i setup.py || die "sed failed"
+
        distutils_src_prepare
 }