From 0a2f29829906cb38c8ac17f27de9eb87647e53f9 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 4 Sep 2015 21:12:47 +0200 Subject: [PATCH] python-psutil: update to 3.2.1 Adopted. --- srcpkgs/python-psutil/patches/musl.patch | 24 ------------------------ srcpkgs/python-psutil/template | 16 ++++++++++------ 2 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/python-psutil/patches/musl.patch diff --git a/srcpkgs/python-psutil/patches/musl.patch b/srcpkgs/python-psutil/patches/musl.patch deleted file mode 100644 index 779ad84f32f..00000000000 --- a/srcpkgs/python-psutil/patches/musl.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- psutil/_psutil_linux.c -+++ psutil/_psutil_linux.c -@@ -517,7 +517,7 @@ psutil_net_if_stats(PyObject* self, PyObject* args) - // duplex and speed - memset(ðcmd, 0, sizeof ethcmd); - ethcmd.cmd = ETHTOOL_GSET; -- ifr.ifr_data = (caddr_t)ðcmd; -+ ifr.ifr_data = (void *)ðcmd; - ret = ioctl(sock, SIOCETHTOOL, &ifr); - - if (ret != -1) { -diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c -index 183dab0e12ee..4ff410601e85 100644 ---- psutil/_psutil_posix.c -+++ psutil/_psutil_posix.c -@@ -418,7 +418,7 @@ psutil_net_if_stats(PyObject *self, PyObject *args) - // speed / duplex - memset(&ifmed, 0, sizeof(struct ifmediareq)); - strlcpy(ifmed.ifm_name, nic_name, sizeof(ifmed.ifm_name)); -- ret = ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed); -+ ret = ioctl(sock, SIOCGIFMEDIA, (void *)&ifmed); - if (ret == -1) { - speed = 0; - duplex = 0; diff --git a/srcpkgs/python-psutil/template b/srcpkgs/python-psutil/template index 5721f95fe72..2061cdbcba9 100644 --- a/srcpkgs/python-psutil/template +++ b/srcpkgs/python-psutil/template @@ -1,6 +1,6 @@ # Template file for 'python-psutil' pkgname=python-psutil -version=3.1.1 +version=3.2.1 revision=1 wrksrc="psutil-${version}" build_style=python-module @@ -8,16 +8,19 @@ python_versions="2.7 3.4" hostmakedepends="python-setuptools python3.4-setuptools" makedepends="python-devel python3.4-devel" pycompile_module="psutil" -maintainer="Juan RP " -homepage="https://github.com/giampaolo/psutil" -license="BSD" short_desc="Cross-platform process and system utilities module for Python2" +maintainer="Alessio Sergi " +homepage="https://github.com/giampaolo/psutil" +license="3-clause-BSD" distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz" -checksum=d3290bd4a027fa0b3a2e2ee87728056fe49d4112640e2b8c2ea4dd94ba0cf057 +checksum=7f6bea8bfe2e5cfffd0f411aa316e837daadced1893b44254bb9a38a654340f7 pre_build() { # remove shebangs - sed -i '/^#!/d' psutil/*.py + sed -i '1d' psutil/*.py +} +post_install() { + vlicense LICENSE } python3.4-psutil_package() { @@ -26,5 +29,6 @@ python3.4-psutil_package() { short_desc="${short_desc/Python2/Python3.4}" pkg_install() { vmove usr/lib/python3.4 + vlicense LICENSE } }