Fix DEPEND.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/dev-python/pypcap/ChangeLog b/dev-python/pypcap/ChangeLog
index 12fb4f35bc3ce9b2862e580e91b449ce09ea782d..49b26df728dbe0a4c9d3a7f4998d914ac90aec82 100644 (file)
--- a/dev-python/pypcap/ChangeLog
+++ b/dev-python/pypcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pypcap
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/ChangeLog,v 1.14 2014/08/12 04:03:26 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/ChangeLog,v 1.15 2015/01/16 15:33:48 jer Exp $
+
+  16 Jan 2015; Jeroen Roovers <jer@gentoo.org> -pypcap-1.1-r1.ebuild,
+  -pypcap-1.1-r2.ebuild, pypcap-1.1.1.ebuild, -files/include_path.patch:
+  Fix DEPEND.
 
 *pypcap-1.1.1 (12 Aug 2014)
 

diff --git a/dev-python/pypcap/Manifest b/dev-python/pypcap/Manifest
index c6d46e6f0cb5a7e00432ef849cc3f6f2c9b92ba1..83f2b28376eeb20784c84bd8597cea65411b6b6e 100644 (file)
--- a/dev-python/pypcap/Manifest
+++ b/dev-python/pypcap/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX include_path.patch 614 SHA256 945ca669fe3478b9994241750a28cb6e94f7da466d05f42baef59715fcacb2af SHA512 fdd8330af6f5aee6129ebf67e104d48167c71371cb13ae4caa2406bd91fd715a8032a081a13ad65b377a5f43686dee41cf9ac39becca2ded49265b91ca79ead1 WHIRLPOOL 98c4c825a76e74a4906d2675ba864e17eb0bde3ae1d252249764bfec36bf2d5cf87791d3e340ac088fc52eaeedb77d1bbdf07bf81d2a0193547ea9663f1c9cb5
 DIST pypcap-1.1.1.tar.gz 44878 SHA256 b310d5af36f5d68ef4217fda68086ffce56345b415eaac15ad618f94057b017b SHA512 339a081cc06edc2f532b7a8eb962b3fd1d1185ed4fb42ef4a3b768bb27d852a7878d4e08ca421b0fdabd6db61b53663fbf20a073fa61f1839e06bdaf13ec1060 WHIRLPOOL 52cabe0b91747657a1f923ee619771d56af1c544ae7635f1e7e7dc0030064b8edcfe8ef9dc604163b85dce89b79b75e5595736863255147af7e34a2d7070821c
-DIST pypcap-1.1.tar.gz 22951 SHA256 087677295c795f543fad2c286df1807d55876e85d04f7292335cd149f4d8d47f SHA512 f4fefb48f01b9080446d83fca3793f97aba3b3677d38520c977c49be061568163299a89c5bc6ec552d68c01fc211e1501b75a835eb68412ab8f6e4307eb0b599 WHIRLPOOL 87ff8ea3d1093cd9a937fdd350297e821a569cb598b7b23dc24d24af94bf147d9156f077a4693fd32cf88fc039798c8229fca176fd5e735930d492db3876a459
-EBUILD pypcap-1.1-r1.ebuild 1729 SHA256 420534e202910043fd0b8dc15361421b426882926126686805de1a6804833ffb SHA512 3f1514f6c86b6ebbd6138812d7922094e9efedeee9bd502af5ef3d11395d96ee00d0e0c05755da63582731aa3a444fdd8358adf936dab750872cc5282bc45a8c WHIRLPOOL 19b3cffb69fa5efa552c0f7a1bbd222cca556bc9117efc50a39dab4817e35faa2c87948cf485c5a7a8bb365c5a4906ab0a7d18c7efbc914c7a64b8e3cffedbd1
-EBUILD pypcap-1.1-r2.ebuild 1434 SHA256 bcfcfa474bf3ac3682806e98137f086ea5d8597780a5c65df2790355889ce215 SHA512 40d831fd2ab57c8fa6f3027ce58a8fc0053c7581126e276e9954578f2745bfee42512096534551ebfe31adce3d9686efdfaba1ff86716921c8b014a4a5e93e60 WHIRLPOOL 0bcb04351a892fa94cf8945c6c60207bc3db613ec178c861122dab4fed31ad971c0c8215d82adcf89c80c6efbf09c6ae93fa5eb044d839f511178fcb2a001683
-EBUILD pypcap-1.1.1.ebuild 702 SHA256 f8bbe9c6e841c7ab853782ef797eb4bbc3adc071190a20ae02b219fad8188e10 SHA512 3967f70f7363aab6c30c477da83141388229b2d6ce8a1455761e6371af9de490b28604fdbd94553d2e1f6abb09acb14191c83bd695c8b5e174944cd7c8974c56 WHIRLPOOL 84e679a2dc41229685916c3a45ed3f1b6c0a05447734b8dd32280b60dbded69e5c9ff38c68d919087d555020ba2c39c4ae0cd101916c9ba6aef2566c745ffbaf
-MISC ChangeLog 2126 SHA256 069b027ca02eaf5f395615beb6a4b74baf78999d1230e5be0779fbfc8453de39 SHA512 586df82404747c7661255ed373d8720630eb2d27a41026cb58421da48e1270fd2f82ad5069e04dd0c3396eb77b3a9474695a48a3238f9702acaca73d87ea8112 WHIRLPOOL df84b34d1a5d88862a4127800126f5fa7e41d55f00b7f6ac274255ec2c814300837e1c2b4bcb30b91032049f780efc85f96f37722e8bead3052363c8192f14df
+EBUILD pypcap-1.1.1.ebuild 705 SHA256 b5dcd668ea94d692e06f77cff25f5f5ea43ce9261544bb813ed059bc093a4d01 SHA512 a9bf3123f177947ee105c497d44dc482ce64c79cc434ddcce1aeae2c4457b9589aa29415111e769ca98cd510d5a10a00e39169379c8d07537a69367d4f717f15 WHIRLPOOL b2639baaf5e4bf8204a0cd35a3ecb2637cb10d7f3a20734a46ba3ca1722ca1b9d407ea4d1fbc3010c481093a2855e304aa5002cff111f736fccfa019e0069c85
+MISC ChangeLog 2280 SHA256 1c18780e632783471d045c9ed17d98da2b3e694b7c53627585c31a34c03f31b7 SHA512 9692aa32beed26b67115b6f042e9b5ca3d9c6c0085dac00da846ace67aa029ce5e8c9ea444e12f6b4d763824f2c559807ae89ea976fd5c855463b87d7cb9b10d WHIRLPOOL 43e4325dff4ca5577eb26177127650d2c7b360d0dad23feabe6f4dc11271487aa3fe7991e7eda3d3784a8f82a77aa6b580362f6af7570b937a3591e2dcceae9a
 MISC metadata.xml 257 SHA256 1baf86b348c8671235f1a139800f56a2e0c1451ace1cbb1aa5c4d0dc903b870b SHA512 bea1a2c01eeae0c8261daf694b65112e6ac9e739b21b6195c290b33eb1e4ae55b3ecf0c8259e42699c2175b3f54743bc69f9a6b627b92a0323535242130cab4c WHIRLPOOL b56020eb8f8462554ed43142b0c0b7e47a84ee901695eea79aa0472f177056e8bdec4bd92a105e8583c7dcc07dcc03e0673fba60ea9de02eaabbdad4f1d2b7e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlPpj/oACgkQso7CE7gHKw184ACfYwxpoQMvD0GIBEIzBvcpTg0M
-/EcAoI85SP5hRckB/3mw4/T+Othdf3zc
-=zgM+
+iEYEAREIAAYFAlS5L14ACgkQVWmRsqeSphMslACfduiPpNdEYOnC3RoYUDgf01iR
++/QAn2bq27qihHakvznyQfsot/kEXKx4
+=mozN
 -----END PGP SIGNATURE-----

diff --git a/dev-python/pypcap/files/include_path.patch b/dev-python/pypcap/files/include_path.patch
deleted file mode 100644 (file)
index a02c82e..0000000
--- a/dev-python/pypcap/files/include_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 9aada5a..71d0d34 100644
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@ class config_pcap(config.config):
-             dirs = [ '/usr', sys.prefix ] + glob.glob('/opt/libpcap*') + \
-                    glob.glob('../libpcap*') + glob.glob('../wpdpack*')
-         for d in dirs:
--            for sd in ('include', 'include/pcap', ''):
-+            for sd in ('include/pcap', 'include', ''):
-                 incdirs = [ os.path.join(d, sd) ]
-                 if os.path.exists(os.path.join(d, sd, 'pcap.h')):
-                     cfg['include_dirs'] = [ os.path.join(d, sd) ]

diff --git a/dev-python/pypcap/pypcap-1.1-r1.ebuild b/dev-python/pypcap/pypcap-1.1-r1.ebuild
deleted file mode 100644 (file)
index 195eec4..0000000
--- a/dev-python/pypcap/pypcap-1.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.8 2012/04/02 10:21:13 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
-HOMEPAGE="http://code.google.com/p/pypcap/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-       >=dev-python/pyrex-0.9.5.1a"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-DOCS="CHANGES"
-
-src_prepare() {
-       # Work around broken exception handling (bug #318401).
-       sed -e "s/raise exc\[0\], exc\[1\], exc\[2\]/raise NotImplementedError/" -i pcap.pyx || die "sed failed"
-
-       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
-}
-
-src_configure() {
-       configuration() {
-               # pcap.c was generated with pyrex-0.9.3
-               # and <=pyrex-0.9.5.1a is incompatible with python-2.5.
-               # So we regenerate it. Bug #180039
-               pyrexc pcap.pyx || die "pyrexc failed"
-               "$(PYTHON)" setup.py config
-       }
-       python_execute_function -s configuration
-}
-
-src_test() {
-       testing() {
-               # PYTHONPATH is set correctly in the test itself
-               "$(PYTHON)" test.py
-       }
-       python_execute_function -s testing
-}
-
-src_install() {
-       distutils_src_install
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}
-               doins testsniff.py || die "doins failed"
-       fi
-}

diff --git a/dev-python/pypcap/pypcap-1.1-r2.ebuild b/dev-python/pypcap/pypcap-1.1-r2.ebuild
deleted file mode 100644 (file)
index 7b0b84f..0000000
--- a/dev-python/pypcap/pypcap-1.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/pypcap-1.1-r2.ebuild,v 1.1 2014/08/11 11:17:26 jer Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=true
-inherit distutils-r1 eutils
-
-DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
-HOMEPAGE="http://code.google.com/p/pypcap/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="
-       ${RDEPEND}
-       >=dev-python/pyrex-0.9.5.1a
-"
-
-DOCS=( CHANGES README testsniff.py )
-
-src_prepare() {
-       # Work around broken exception handling (bug #318401).
-       sed -i \
-               -e "s|raise exc\[0\], exc\[1\], exc\[2\]|raise NotImplementedError|" \
-               pcap.pyx || die
-
-       epatch "${FILESDIR}/include_path.patch"
-
-       # Check existence of shared library instead of static library.
-       sed -i -e "s/'libpcap.a'/'libpcap.so'/" setup.py || die
-
-       # Fails to find out of source built module
-       sed -i -e '/^sys.path.insert/s|^|#|' test.py || die
-
-       distutils-r1_src_prepare
-}
-
-src_configure() {
-       # pcap.c was generated with pyrex-0.9.3
-       # and <=pyrex-0.9.5.1a is incompatible with python-2.5.
-       # So we regenerate it. Bug #180039
-       pyrexc pcap.pyx || die
-       "${EPYTHON}" setup.py config || die
-}
-
-python_test() {
-       PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}" "${EPYTHON}" test.py || die
-}

diff --git a/dev-python/pypcap/pypcap-1.1.1.ebuild b/dev-python/pypcap/pypcap-1.1.1.ebuild
index 922f1864ff0f6e3324bad2ecd308d0eade66f0e2..fc306b6660ea9e909c51817f6ce8b16103a49ebd 100644 (file)
--- a/dev-python/pypcap/pypcap-1.1.1.ebuild
+++ b/dev-python/pypcap/pypcap-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/pypcap-1.1.1.ebuild,v 1.1 2014/08/12 04:03:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/pypcap-1.1.1.ebuild,v 1.2 2015/01/16 15:33:48 jer Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 pypy )
@@ -14,10 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="net-libs/libpcap"
+DEPEND="
+       ${RDEPEND}
+       dev-python/setuptools[${PYTHON_USEDEP}]
+"
 
 python_compile() {
        local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"