netifaces: upgraded package to upstream
Upgraded dev-python/netifaces to version 0.10.5 on amd64
BUG=None
TEST=Tested locally on a Guado box, which uses netifaces for ip address checking.
Change-Id: I4092f049473fe46fc31dab85a44d206402417c7b
Reviewed-on: https://chromium-review.googlesource.com/411450
Commit-Ready: Chunxiao Diao <cdiao@google.com>
Tested-by: Chunxiao Diao <cdiao@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index d5f0e90..81f6bea 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1 +1 @@
-DIST netifaces-0.8.tar.gz 15484 RMD160 e5204d8415d1ae1ec84118eeb86928a1ea770f18 SHA1 a483338e1cb75dd572109467d523e152088c026d SHA256 53a711038db3d6e5cf7129d6f751185fd052f830f12f271fbfe17bd2671ab1ec
+DIST netifaces-0.10.5.tar.gz 24879 SHA256 59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b SHA512 736bb985b444e78676dc10533a7597e750cadf41033196c4be49c4f33e91d46eba33a1f485e07e9f70aec2170c958564a6f54bbaa1ab193bfaca04b1fb07b3a1 WHIRLPOOL 7a0d63508dc2d2f80a4fbe4a92468696cb3335c9a47410a617de12f7c1f167a4bfc9d3a122dc666e5956b9b1422ed11f9e1839e929c85f0b0cc289eeccba4c35
diff --git a/dev-python/netifaces/files/netifaces-0.10.4-remove-osx-fix.patch b/dev-python/netifaces/files/netifaces-0.10.4-remove-osx-fix.patch
new file mode 100644
index 0000000..7f87a02
--- /dev/null
+++ b/dev-python/netifaces/files/netifaces-0.10.4-remove-osx-fix.patch
@@ -0,0 +1,15 @@
+--- netifaces-0.10.4/setup.py
++++ netifaces-0.10.4/setup.py
+@@ -18,12 +18,6 @@
+
+ __version__ = "0.10.4"
+
+-# Disable hard links, otherwise building distributions fails on OS X
+-try:
+- del os.link
+-except:
+- pass
+-
+ # On Windows, we need ws2_32 and iphlpapi
+ if getattr(sys, 'getwindowsversion', None):
+ libraries = ['ws2_32', 'iphlpapi']
diff --git a/dev-python/netifaces/metadata.xml b/dev-python/netifaces/metadata.xml
index 01874fb..3efab30 100644
--- a/dev-python/netifaces/metadata.xml
+++ b/dev-python/netifaces/metadata.xml
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>python</herd>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">netifaces</remote-id>
+ </upstream>
</pkgmetadata>
-
diff --git a/dev-python/netifaces/netifaces-0.10.5.ebuild b/dev-python/netifaces/netifaces-0.10.5.ebuild
new file mode 100644
index 0000000..c01f364
--- /dev/null
+++ b/dev-python/netifaces/netifaces-0.10.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Portable network interface information"
+HOMEPAGE="
+ https://pypi.python.org/pypi/netifaces/
+ http://alastairs-place.net/netifaces/
+ https://bitbucket.org/al45tair/netifaces"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/netifaces/netifaces-0.8.ebuild b/dev-python/netifaces/netifaces-0.8.ebuild
deleted file mode 100644
index c191316..0000000
--- a/dev-python/netifaces/netifaces-0.8.ebuild
+++ /dev/null
@@ -1,23 +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/netifaces/netifaces-0.8.ebuild,v 1.4 2012/07/11 12:24:34 vapier Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils python
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="http://alastairs-place.net/netifaces/"
-SRC_URI="http://alastairs-place.net/projects/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.5 b/metadata/md5-cache/dev-python/netifaces-0.10.5
new file mode 100644
index 0000000..f3e9f4f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/netifaces-0.10.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Portable network interface information
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/netifaces/ http://alastairs-place.net/netifaces/ https://bitbucket.org/al45tair/netifaces
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/n/netifaces/netifaces-0.10.5.tar.gz
+_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 06133990e861be0fe60c2b428fd025d9 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 9f6eda21d15d6a8f665d7996a4e0f4e3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=76e36578b5a404ac983c05d6def9a253
diff --git a/metadata/md5-cache/dev-python/netifaces-0.8 b/metadata/md5-cache/dev-python/netifaces-0.8
deleted file mode 100644
index d62182d..0000000
--- a/metadata/md5-cache/dev-python/netifaces-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/setuptools =dev-lang/python-2*
-DESCRIPTION=Portable network interface information
-EAPI=4
-HOMEPAGE=http://alastairs-place.net/netifaces/
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://alastairs-place.net/projects/netifaces/netifaces-0.8.tar.gz
-_eclasses_=distutils 92e738ea29389cb3f34778d7a349ac71 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python cd022f89fef846d083fc994b9e3d8c04 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=c30d76d0dddbe337a134b2cabd00fbbb
