gentoo resync : 16.09.2021

4 files changed, 82 insertions, 2 deletions

diff --git a/dev-libs/libserialport/Manifest b/dev-libs/libserialport/Manifest
index d4cd7bd20ebb..1e493bacc301 100644
--- a/dev-libs/libserialport/Manifest
+++ b/dev-libs/libserialport/Manifest
@@ -1,4 +1,6 @@
+AUX libserialport-0.1.1-kernel-termiox.patch 1216 BLAKE2B bbb629086c2e21caf683df74d63abd4c706ac05a4906d8322d369ca491ad2421416ca6abb579ca8c2eff7f862557338ab9bd31bf0954d8b564b2c06c1fad4810 SHA512 12b99310a2072e9a3a5df61cc2b2121e9b7823caebd88d22a344a885ff777ad955787303b6148e0b803a605877136f357ce211dcfeeae4938538d146f679d992
 DIST libserialport-0.1.1.tar.gz 405251 BLAKE2B bc52d7b5303c123a28becde1e77451a921c2b6d5284ccfaca298d0535a793297d30e297109382a7266263530ac9a0e0b598ce8d1602e0700b43bda227f29a6b3 SHA512 7d379d1099173841e6d4df04c8c12dc6a4ebdfa0323ef35da6f3dea20db55d4f6ad81c1f6679f5aac7fe83270176428a817daa8627c336505335a07e06350a85
+EBUILD libserialport-0.1.1-r1.ebuild 892 BLAKE2B cdf1d4fcc07990a2f5b2fb1f8aaefcea72a347dc62ab484e71dac1bb018ce276959e206f1b59c33c700ab87922ab8ae9b994db10e05e0cf0adc086b5d2491aeb SHA512 f34026d0532feeadb441b4e2e0051c2313d73e95bd8fda9f411df364f0a84ed16132c8b1b612d4283938dbe10207669ccc4e445b17d18ea3630397d67b151081
 EBUILD libserialport-0.1.1.ebuild 692 BLAKE2B 106bdff476945cefbbc9162856b0af9747dda3a3b3865754756f7e4ade3aaa3b79460aeaa628ca79e65e6584f093003ea40d153cc891a86ad75cbb25ca17d154 SHA512 dfbef0d6b5a7e303594c9b07298011c2b85ec66e703f9cedcec9eaf161a02d5392ff1dcea3f9289e270650d642316c39cca81e7b027e1ec18f14a3ee9760e4e7
 EBUILD libserialport-9999.ebuild 694 BLAKE2B 9671aab0c1051e374eee35100e207bf27b013e55bcc6085594d4532d474b6455b3c4bf0c575daff46d0e76aa649c9685bc254a971760f71c534b3c2aaec9c997 SHA512 32f60eaa716ea29efc044c78793a4ac34fd1dc2d2943325abb964315d5721151abefd53123028ac5d19b91fe5e4445208a160e8f5ea14681077ff9052563844d
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
+MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/dev-libs/libserialport/files/libserialport-0.1.1-kernel-termiox.patch b/dev-libs/libserialport/files/libserialport-0.1.1-kernel-termiox.patch
new file mode 100644
index 000000000000..8a8aed26a31d
--- /dev/null
+++ b/dev-libs/libserialport/files/libserialport-0.1.1-kernel-termiox.patch
@@ -0,0 +1,32 @@
+https://sigrok.org/gitweb/?p=libserialport.git;a=commitdiff;h=6f9b03e597ea7200eb616a4e410add3dd1690cb1
+https://sigrok.org/bugzilla/show_bug.cgi?id=1687
+https://bugs.gentoo.org/813273
+
+Fixes runtime breakage with newer kernels.
+
+From: Karl Palsson <karlp@etactica.com>
+Date: Fri, 11 Jun 2021 17:07:09 +0000
+Subject: [PATCH] HACK: don't even check for termiox
+
+termiox was removed from linux in e0efb3168d34
+Some more information available in https://www.spinics.net/lists/linux-serial/msg41926.html
+
+Attempting to use the termiox ioctls on more modern kernels results in
+"Inappropriate IOCTL" errors.
+
+While the "right" solution might be to remove the termiox code from the
+linux path, simply not checking for termiox builds a libserialport that
+functions on modern linux kernels.
+
+Signed-off-by: Karl Palsson <karlp@etactica.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,7 +112,7 @@ AC_SYS_LARGEFILE
+ AC_TYPE_SIZE_T
+ 
+ # Check for specific termios structures.
+-AC_CHECK_TYPES([struct termios2, struct termiox],,,
++AC_CHECK_TYPES([struct termios2],,,
+ 	[[#include <linux/termios.h>]])
+ AC_CHECK_MEMBERS([struct termios.c_ispeed, struct termios.c_ospeed,
+ 		struct termios2.c_ispeed, struct termios2.c_ospeed],,,
diff --git a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..a06498d3dbfc
--- /dev/null
+++ b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Cross platform serial port access library"
+HOMEPAGE="https://sigrok.org/wiki/Libserialport"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="static-libs"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-kernel-termiox.patch
+)
+
+src_prepare() {
+	default
+
+	#[[ ${PV} == "9999" ]] && eautoreconf
+	# Needed for the termiox patch, should be able to drop on next release
+	# (change back this + inherit to just for 9999)
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libserialport/metadata.xml b/dev-libs/libserialport/metadata.xml
index 71b1461e1146..98ae10b3c34a 100644
--- a/dev-libs/libserialport/metadata.xml
+++ b/dev-libs/libserialport/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>embedded@gentoo.org</email>