gentoo resync : 24.12.2018

4 files changed, 22 insertions, 147 deletions

diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 83ff1884f309..ce807652cd20 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,6 +1,5 @@
-AUX i2c-tools-3.1.1-python-3.patch 3348 BLAKE2B 4fbe75455e4370da6c61c786cd0eaef94039b24d9de33ecc1ac6333f5776d61d8638493f7b7218bd15e36301cfeed840217050ed37edf3825017cdbf9b7b3d25 SHA512 0f264e49237af0318c868deac39bdd7c2b718c39317c2e47b15ad7d421530dc165f38b5995ca45bcfd65074ab51022d88ced6f2d589e30ebbab1702cf964f8da
-DIST i2c-tools-3.1.1.tar.bz2 71789 BLAKE2B 0a7a3db6a3b396cfb8d5e58d8c83cae4e52239786502c6552d971350f7fc05a1ce9d7d89e9cdb154a21ac15bdf34aa0dec9501ea45317ec9c5d9fc211780bbf1 SHA512 b91f89b803e5558d49ce63f42f6542438f4f47927e4ce420cd9df989cab14a5c55d971befed73e8f793b0cf4aa41936c0ef519e5a407dceb2c08964461e803c5
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
-EBUILD i2c-tools-3.1.1-r1.ebuild 1438 BLAKE2B c9d1e61d5c2f743cca2bdbae3c518998178fbafd09a42538c91d1b637dcc9bd31a1cb746a63fc81e06875c76386a70832305d8cb6f48d3fa282ec598c094b0f2 SHA512 7187a3759ab86014023b45adc9aeea93e7dc1f29f6266b7ef1c514d65e28bb097aa74844d5d279b3961d544f21283ae6076b7c5206c78393866dc4aa41173150
-EBUILD i2c-tools-4.0.ebuild 1432 BLAKE2B 70e475892ca52c88701ecae44ef51b9811ac82c37a4870d19437936d0896e6835fc13b6d1e43e825e40aaf901557113b387423d515922cb85925b545b871c181 SHA512 879d1b557ee60bf5619ce77bc9ff1936552e4b4073a0945eff289e905f202d86bef7ccd279284fe240519042ce0584df018c40ee9a40297670ac193d9894a740
+DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
+EBUILD i2c-tools-4.0.ebuild 1426 BLAKE2B 5ac0667c25aac0bb702b6fb4710a49f5b757900a4fd60380b044c9e106604f021d84c9b12402a12725039793fb5284467b4c14f9308842777b6539a0837a6b01 SHA512 f930853406ca01db15d14e865c0a3b9ccfca306f4ee8d094c31afecbc72cd571b33db9a07b9bb04a23c494ac19fb97dbc34c38bd003831a272dc8274981d8656
+EBUILD i2c-tools-4.1.ebuild 1537 BLAKE2B cfaf2d3e7cb5b781cf879ffce5a3fc3a0ef852425afc4c98639d67885b838e963a1544e4da80d014e39618320f52d3fec3b6a24214224d8aa336d544fc433912 SHA512 97390dca8ef3fe0b0aa3c5389ebb53de0cfc42dbe58840452028d79d77f38c75e1dea22f8152a7156863068d8aac89cfe06c9a095fee76870ab2fd504bc52168
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch b/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch
deleted file mode 100644
index 1f3de76052e7..000000000000
--- a/sys-apps/i2c-tools/files/i2c-tools-3.1.1-python-3.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-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/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index 3cd2a7f55086..d9fc31d5b826 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1.ebuild
index 98c99d4b0435..f87aa062cf91 100644
--- a/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="I2C tools for bus probing, chip dumping, 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"
+HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
+SRC_URI="${HOMEPAGE}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="python"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="!<sys-apps/lm_sensors-3
@@ -24,7 +24,6 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
-	epatch "${FILESDIR}"/${PN}-3.1.1-python-3.patch #492632
 	use python && distutils-r1_src_prepare
 }
 
@@ -33,8 +32,10 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
-	emake -C eepromer CC=$(tc-getCC) CFLAGS="${CFLAGS} -I../include"
+	emake  AR=$(tc-getAR) CC=$(tc-getCC) all-lib # parallel make
+	emake CC=$(tc-getCC)
+	emake -C eepromer CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+
 	if use python ; then
 		cd py-smbus || die
 		append-cppflags -I../include
@@ -43,8 +44,8 @@ src_compile() {
 }
 
 src_install() {
-	emake install prefix="${D}"/usr
-	dosbin eepromer/eepro{g,m{,er}}
+	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" PREFIX="/usr" install-lib install
+	dosbin eepromer/eeprom{,er}
 	rm -rf "${D}"/usr/include || die # part of linux-headers
 	dodoc CHANGES README
 	local d
@@ -59,4 +60,8 @@ src_install() {
 		dodoc README*
 		distutils-r1_src_install
 	fi
+
+	if ! use static-libs; then
+		rm -rf "${D}"/usr/$(get_libdir)/libi2c.a || die
+	fi
 }