From 4289d134c251b0c87bbd5fb4ee1258eb46ec8e39 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 28 May 2015 09:36:41 -0700 Subject: [PATCH] bump(sys-apps/i2c-tools): sync with upstream for arm64 Signed-off-by: Geoff Levand --- .../md5-cache/sys-apps/i2c-tools-3.0.2 | 6 +- .../md5-cache/sys-apps/i2c-tools-3.1.1-r1 | 13 ++ .../sys-apps/i2c-tools/ChangeLog | 87 ++++++++++++ .../sys-apps/i2c-tools/Manifest | 8 +- .../files/i2c-tools-3.1.1-python-3.patch | 129 ++++++++++++++++++ .../sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild | 8 +- .../i2c-tools/i2c-tools-3.1.1-r1.ebuild | 60 ++++++++ .../sys-apps/i2c-tools/metadata.xml | 5 + 8 files changed, 308 insertions(+), 8 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/ChangeLog create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/i2c-tools-3.0.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/i2c-tools-3.0.2 index b97083feda..a7ae624922 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/i2c-tools-3.0.2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/i2c-tools-3.0.2 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile install postinst postrm prepare setup DEPEND=!=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) +DESCRIPTION=I2C tools for bus probing, chip dumping, register-level access helpers, EEPROM decoding, and more +EAPI=5 +HOMEPAGE=http://www.lm-sensors.org/wiki/I2CTools +IUSE=python python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 +KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 +LICENSE=GPL-2 +RDEPEND=!=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) +SLOT=0 +SRC_URI=http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.1.tar.bz2 +_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 +_md5_=509f7bce3e63439e174605237bcbcf08 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/ChangeLog new file mode 100644 index 0000000000..04523e6f01 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/ChangeLog @@ -0,0 +1,87 @@ +# ChangeLog for sys-apps/i2c-tools +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c-tools/ChangeLog,v 1.22 2015/04/04 06:28:17 mr_bones_ Exp $ + + 04 Apr 2015; Michael Sterrett -i2c-tools-3.1.0.ebuild, + -i2c-tools-3.1.1.ebuild: + old + +*i2c-tools-3.1.1-r1 (21 Mar 2015) + + 21 Mar 2015; Michał Górny +i2c-tools-3.1.1-r1.ebuild: + EAPI bump, bug #543162. + +*i2c-tools-3.1.1 (16 Oct 2014) + + 16 Oct 2014; Mike Frysinger + +files/i2c-tools-3.1.1-python-3.patch, +i2c-tools-3.1.1.ebuild: + Version bump & port to distutils-r1 #524722 by Paul Zander. Port to + python-3.x #492632 by Marcel Greter. + + 12 Mar 2014; Patrick Lauer i2c-tools-3.0.2.ebuild, + i2c-tools-3.1.0.ebuild: + Shorten description for improved repoman happy + + 18 Oct 2013; Mike Frysinger i2c-tools-3.1.0.ebuild: + Add mor keywords. + + 22 Feb 2013; Agostino Sarubbo i2c-tools-3.0.2.ebuild: + Stable for arm, wrt bug #458190 + + 18 Nov 2012; Pacho Ramos -i2c-tools-3.0.3.ebuild, + metadata.xml: + Drop mobile herd as talked in gentoo-dev ML + + 19 Apr 2012; Michael Weber i2c-tools-3.1.0.ebuild: + call python_pkg_setup unconditionally (bug 412013) + +*i2c-tools-3.1.0 (14 Apr 2012) + + 14 Apr 2012; Michael Weber +i2c-tools-3.1.0.ebuild: + Version bump (non-maint commit, bug 410277). + + 06 Nov 2011; Raúl Porcel i2c-tools-3.0.2.ebuild, + i2c-tools-3.0.3.ebuild: + Add ~sparc wrt #369895 + + 05 Mar 2011; Arfrever Frehtes Taifersar Arahesis + i2c-tools-3.0.2.ebuild, i2c-tools-3.0.3.ebuild: + Set SUPPORT_PYTHON_ABIS (bug #316929). + +*i2c-tools-3.0.3 (07 Jan 2011) + + 07 Jan 2011; Mike Frysinger +i2c-tools-3.0.3.ebuild: + Version bump. + + 10 Jun 2009; Markus Meier i2c-tools-3.0.2.ebuild: + amd64/x86 stable, bug #273049 + +*i2c-tools-3.0.2 (14 Jan 2009) + + 14 Jan 2009; Mike Frysinger +i2c-tools-3.0.2.ebuild: + Version bump and add support for USE=python #246182 by Alex Guensche. + + 09 May 2008; i2c-tools-3.0.1.ebuild: + - keyworded for arm + + 10 Apr 2008; Markus Meier i2c-tools-3.0.0.ebuild: + amd64/x86 stable, bug #216276 + + 10 Apr 2008; Mike Frysinger i2c-tools-3.0.0.ebuild, + i2c-tools-3.0.1.ebuild: + Dont install any files into /usr/include as they are part of the + linux-headers package #216276 by Markus Meier. + + 07 Apr 2008; Mike Frysinger i2c-tools-3.0.0.ebuild, + i2c-tools-3.0.1.ebuild: + Make sure to block lm_sensors versions older than 3.0 #216276. + +*i2c-tools-3.0.1 (07 Apr 2008) + + 07 Apr 2008; Mike Frysinger +i2c-tools-3.0.1.ebuild: + Version bump. + +*i2c-tools-3.0.0 (23 Jan 2008) + + 23 Jan 2008; Mike Frysinger +i2c-tools-3.0.0.ebuild: + Initial ebuild by me. diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/Manifest index d6446c8800..85ef081372 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/Manifest @@ -1 +1,7 @@ -DIST i2c-tools-3.0.2.tar.bz2 62523 RMD160 533343f0fc1d5db54a526bb6d6037e2b30e52908 SHA1 3764d72d6b0c816c01d895485b610c742498ea94 SHA256 0b4d6455a30a3264a60b4d3be55855d996d52ea4f162a2f04ffff378e24f98a2 +AUX i2c-tools-3.1.1-python-3.patch 3348 SHA256 38ad348a8e18571e49f01874df05fb9f13e1b7e8e2c659f684eae68ddee34920 SHA512 0f264e49237af0318c868deac39bdd7c2b718c39317c2e47b15ad7d421530dc165f38b5995ca45bcfd65074ab51022d88ced6f2d589e30ebbab1702cf964f8da WHIRLPOOL 45238e25f6eefbd7a9bac665dd8a0f4f41ee8c096e804af8e27745b1109bcb35e8eb6565b9b181ae24834c938259cbd40f77837729c93ed8ad3ab27ef1b1abea +DIST i2c-tools-3.0.2.tar.bz2 62523 SHA256 0b4d6455a30a3264a60b4d3be55855d996d52ea4f162a2f04ffff378e24f98a2 SHA512 7e21660c83328a1f60cb4aa3dcc15ed0c745a426582afb48b09dca86cba0aa8e879eec59f6a029b36932c338395c10a3a88856a712f1680eba88643e6fbacf04 WHIRLPOOL c550374e8dad9d0005da9d16b50b793782dba79963fb2dfc2ca953a61af51af9d91fce227fd7b889a8c36b15352d2da904a8a8c313ddb577b5a7e0b4dc4fcf71 +DIST i2c-tools-3.1.1.tar.bz2 71789 SHA256 14d4d7d60d1c12e43f2befe239c682a5c44c27682f153d4b58c1e392d2db1700 SHA512 b91f89b803e5558d49ce63f42f6542438f4f47927e4ce420cd9df989cab14a5c55d971befed73e8f793b0cf4aa41936c0ef519e5a407dceb2c08964461e803c5 WHIRLPOOL 5d68236a7c6e5075625420d1e9cb0a075e8e064babbb73163a2bf2a5cf2b0b169e1420ab1ef495533c88f53497767f6256b817c49b5d9f1799f3bde6d7e26b24 +EBUILD i2c-tools-3.0.2.ebuild 1362 SHA256 43a57da5e4a15af276c1e38719f43b244412428c101a8c07c9211a23cd555ea1 SHA512 244be3481d42c17bd6a033d1c8e19ab99afbc7d3c163a8814b9c3a9b5da8088ffc9adee4c02abb98e4191088ffd98768f470b7b40466f55592f1c1378305af7d WHIRLPOOL 48e8fdc9133c01e6d41cfb27fec150a1162767788d2d9690c4d9773c2ad1387ebe0f7804e961b1fdca99dcc39951b6a58286cf2f9ccedd442e437167e9ed89ab +EBUILD i2c-tools-3.1.1-r1.ebuild 1515 SHA256 179e8b2585c7df660e3cd6ed76df900f826409a7987352fc79aaa88fa1e141f5 SHA512 88ef212f503f28e4cbe793ad333c9cee716e298f82488d93a5a9b0cad73c47dd3d42cc70b8bffd18b55a08099ab639ef0e0bf5dbf33ff2fb8fb770afd3caa06b WHIRLPOOL 477222590850a84492ada5690dc4c1c502d1196546c3b731696b1068074707d75596a38e773571e9be35ebc735cea38b4d5e1d57f199f327933ea4311d728088 +MISC ChangeLog 3011 SHA256 cfcad5410941d8a29eb27fe22801a3fe6e950651c029e53d4aa20c69b540ee08 SHA512 c51ef452d5bd5b537dbd48f44934e777f635b8b1649407a46cf99486f26c543c93910a50b2f18b0fd2493214bb68eb6a02d4bb920b460c0a1e373aaff51b7da1 WHIRLPOOL 39c7c526ec554a092dfe76f3be89ad37c1dbae6a418ccffa0e16826e0b7711116ce8200446b397f4b656852dd6c6c955d85e9a6c9f63a21b4ac702edc09fd12f +MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch new file mode 100644 index 0000000000..1f3de76052 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch @@ -0,0 +1,129 @@ +support python-3.x + +http://comments.gmane.org/gmane.linux.drivers.i2c/11290 +https://bugs.gentoo.org/492632 + +--- a/py-smbus/smbusmodule.c ++++ b/py-smbus/smbusmodule.c +@@ -32,15 +32,18 @@ + #define I2C_SMBUS_I2C_BLOCK_DATA 8 + #endif + +-PyDoc_STRVAR(SMBus_module_doc, +- "This module defines an object type that allows SMBus transactions\n" +- "on hosts running the Linux kernel. The host kernel must have I2C\n" +- "support, I2C device interface support, and a bus adapter driver.\n" +- "All of these can be either built-in to the kernel, or loaded from\n" +- "modules.\n" +- "\n" +- "Because the I2C device interface is opened R/W, users of this\n" +- "module usually must have root permissions.\n"); ++#define module_doc \ ++ "This module defines an object type that allows SMBus transactions\n" \ ++ "on hosts running the Linux kernel. The host kernel must have I2C\n" \ ++ "support, I2C device interface support, and a bus adapter driver.\n" \ ++ "All of these can be either built-in to the kernel, or loaded from\n" \ ++ "modules.\n" \ ++ "\n" \ ++ "Because the I2C device interface is opened R/W, users of this\n" \ ++ "module usually must have root permissions.\n" ++#if PY_MAJOR_VERSION <= 2 ++PyDoc_STRVAR(SMBus_module_doc, module_doc); ++#endif + + typedef struct { + PyObject_HEAD +@@ -91,7 +94,11 @@ SMBus_dealloc(SMBus *self) + PyObject *ref = SMBus_close(self); + Py_XDECREF(ref); + ++#if PY_MAJOR_VERSION >= 3 ++ Py_TYPE(self)->tp_free((PyObject*)self); ++#else + self->ob_type->tp_free((PyObject *)self); ++#endif + } + + #define MAXPATH 16 +@@ -431,11 +438,19 @@ SMBus_list_to_data(PyObject *list, union i2c_smbus_data *data) + + for (ii = 0; ii < len; ii++) { + PyObject *val = PyList_GET_ITEM(list, ii); ++#if PY_MAJOR_VERSION >= 3 ++ if (!PyLong_Check(val)) { ++#else + if (!PyInt_Check(val)) { ++#endif + PyErr_SetString(PyExc_TypeError, msg); + return 0; /* fail */ + } ++#if PY_MAJOR_VERSION >= 3 ++ data->block[ii+1] = (__u8)PyLong_AS_LONG(val); ++#else + data->block[ii+1] = (__u8)PyInt_AS_LONG(val); ++#endif + } + + return 1; /* success */ +@@ -633,9 +648,27 @@ static PyGetSetDef SMBus_getset[] = { + {NULL}, + }; + ++#if PY_MAJOR_VERSION >= 3 ++static struct PyModuleDef SMBusModule = { ++ PyModuleDef_HEAD_INIT, ++ "smbus.SMBus", /* m_name */ ++ module_doc, /* m_doc */ ++ -1, /* m_size */ ++ NULL, /* m_methods */ ++ NULL, /* m_reload */ ++ NULL, /* m_traverse */ ++ NULL, /* m_clear */ ++ NULL, /* m_free */ ++}; ++#endif ++ + static PyTypeObject SMBus_type = { ++#if PY_MAJOR_VERSION >= 3 ++ PyVarObject_HEAD_INIT(NULL, 0) ++#else + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ ++#endif + "smbus.SMBus", /* tp_name */ + sizeof(SMBus), /* tp_basicsize */ + 0, /* tp_itemsize */ +@@ -683,16 +716,32 @@ static PyMethodDef SMBus_module_methods[] = { + #define PyMODINIT_FUNC void + #endif + PyMODINIT_FUNC +-initsmbus(void) ++#if PY_MAJOR_VERSION >= 3 ++PyInit_smbus(void) ++#else ++initsmbus(void) ++#endif + { + PyObject* m; + ++#if PY_MAJOR_VERSION >= 3 ++ if (PyType_Ready(&SMBus_type) < 0) ++ return NULL; ++ ++ m = PyModule_Create(&SMBusModule); ++ if (m == NULL) ++ return NULL; ++#else + if (PyType_Ready(&SMBus_type) < 0) + return; + + m = Py_InitModule3("smbus", SMBus_module_methods, SMBus_module_doc); ++#endif + + Py_INCREF(&SMBus_type); + PyModule_AddObject(m, "SMBus", (PyObject *)&SMBus_type); ++#if PY_MAJOR_VERSION >= 3 ++ return m; ++#endif + } + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild index 405951c020..519bc0d028 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild,v 1.4 2011/11/06 17:00:50 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild,v 1.6 2014/03/12 03:15:18 patrick Exp $ EAPI="3" PYTHON_DEPEND="python? 2" @@ -9,13 +9,13 @@ RESTRICT_PYTHON_ABIS="3.* *-jython" inherit flag-o-matic toolchain-funcs distutils -DESCRIPTION="I2C tools for bus probing, chip dumping, register-level access helpers, EEPROM decoding scripts, and more" +DESCRIPTION="I2C tools for bus probing, chip dumping, register-level access helpers, EEPROM decoding, and more" HOMEPAGE="http://www.lm-sensors.org/wiki/I2CTools" SRC_URI="http://dl.lm-sensors.org/i2c-tools/releases/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~sparc x86" +KEYWORDS="amd64 arm ~sparc x86" IUSE="python" DEPEND="! + + +maintainer-needed@gentoo.org +