Merge updates from master

7 files changed, 133 insertions, 23 deletions

diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index f754b4a74af5..6f2baae226d8 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,2 +1,2 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
-DIST geventhttpclient-1.4.0.tar.gz 55844 BLAKE2B 2f025acdea114f513c395f58b585b282e89fca66efd778b3d10a6156e88576f3585cfd20fd84c5cf16798be461ddbfc16a0844074ebc1e96c99aab178852dfc4 SHA512 73adb1fbae7b47e1e89c2c589c58d0d22502a81b8e37596706d284f3ef44a67c7ce9c15a8fbbd375cbf6d80adc7a35727276976bad9686c622fec1380b9876e3
+DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
diff --git a/dev-python/geventhttpclient/files/geventhttpclient-1.4.0-dont-install-tests.patch b/dev-python/geventhttpclient/files/geventhttpclient-1.4.0-dont-install-tests.patch
deleted file mode 100644
index 395628dc40f8..000000000000
--- a/dev-python/geventhttpclient/files/geventhttpclient-1.4.0-dont-install-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 6577190f64072c669c579c78225e23fe79edd90e
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Fri May 22 23:36:38 2020 +0200
-
-    Do not install tests
-
-diff --git a/setup.py b/setup.py
-index 6e7a924..c896644 100644
---- a/setup.py
-+++ b/setup.py
-@@ -50,6 +50,7 @@ setup(name='geventhttpclient',
-       author="Antonin Amand",
-       author_email="antonin.amand@gmail.com",
-       packages=find_packages('src'),
-+      exclude_package_data={'geventhttpclient': ['tests/*']},
-       license='LICENSE-MIT',
-       package_dir={'': 'src'},
-       ext_modules = [httpparser],
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.0-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
index 9f4094bf13b5..a4bdea6c6356 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.0-r1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
@@ -29,10 +29,6 @@ BDEPEND="
 	)
 "
 
-# Do not install tests
-# https://github.com/gwik/geventhttpclient/pull/126
-PATCHES=( "${FILESDIR}/${P}-dont-install-tests.patch" )
-
 python_prepare_all() {
 	# Skip SNI tests which require dpkt
 	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..a905c627ddf7
--- /dev/null
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
+HOMEPAGE="http://unixcw.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="alsa ncurses pulseaudio suid test qt5"
+RESTRICT="!test? ( test )"
+
+RDEPEND="ncurses? ( sys-libs/ncurses:= )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5 )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool"
+
+src_prepare() {
+	append-cflags -std=gnu11
+	append-cxxflags -std=gnu++11
+	eapply -p0 "${FILESDIR}"/$PN-3.5-tinfo.patch \
+		"${FILESDIR}"/$PN-tests.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir) \
+		$(use_enable pulseaudio ) \
+		$(use_enable alsa ) \
+		$(use_enable ncurses cwcp ) \
+		$(use_enable qt5 xcwcp ) \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+	dodoc ChangeLog NEWS README
+	if ! use suid ; then
+		fperms 711 /usr/bin/cw
+		if use ncurses ; then
+			fperms 711 /usr/bin/cwcp
+		fi
+		if use qt5 ; then
+			fperms 711 /usr/bin/xcwcp
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use suid ; then
+		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
+		ewarn "by setting USE=suid."
+		ewarn "Be aware that this is a security risk and not recommended."
+		ewarn ""
+		ewarn "These files do only need root access if you want to use the"
+		ewarn "PC speaker for morse sidetone output. You can alternativly"
+		ewarn "drop USE=suid and use sudo."
+	else
+		elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if"
+		elog "you want to use the PC speaker for morse sidetone output."
+		elog "You can call the programs via sudo for that (see 'man sudo')."
+	fi
+}
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
new file mode 100644
index 000000000000..23f48652f9de
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
@@ -0,0 +1,55 @@
+From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 15 May 2020 17:45:30 +0100
+Subject: [PATCH] Fix building with -fno-common (default from GCC 10)
+
+---
+ src/input.h        | 4 ++--
+ src/input/mpegts.c | 2 ++
+ src/input/mpegts.h | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/input.h b/src/input.h
+index a9c96df04..3dce355c6 100644
+--- a/src/input.h
++++ b/src/input.h
+@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th );
+ extern const idclass_t tvh_input_class;
+ extern const idclass_t tvh_input_instance_class;
+ 
+-tvh_input_list_t    tvh_inputs;
+-tvh_hardware_list_t tvh_hardware;
++extern tvh_input_list_t    tvh_inputs;
++extern tvh_hardware_list_t tvh_hardware;
+ 
+ #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link)
+ #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link)
+diff --git a/src/input/mpegts.c b/src/input/mpegts.c
+index e02d491f1..fca4f3429 100644
+--- a/src/input/mpegts.c
++++ b/src/input/mpegts.c
+@@ -20,6 +20,8 @@
+ #include "mpegts/fastscan.h"
+ #include "memoryinfo.h"
+ 
++struct mpegts_listeners mpegts_listeners;
++
+ extern memoryinfo_t mpegts_input_queue_memoryinfo;
+ extern memoryinfo_t mpegts_input_table_memoryinfo;
+ 
+diff --git a/src/input/mpegts.h b/src/input/mpegts.h
+index 9dda3baca..9c4c57b73 100644
+--- a/src/input/mpegts.h
++++ b/src/input/mpegts.h
+@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener
+   void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
+ } mpegts_listener_t;
+ 
+-LIST_HEAD(,mpegts_listener) mpegts_listeners;
++extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners;
+ 
+ #define mpegts_add_listener(ml)\
+   LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)
+-- 
+2.26.2
+
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index 7886d755c7d5..9c12a6de1a1d 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.7-python3.patch
 	"${FILESDIR}"/${PN}-4.2.8-gcc9.patch
 	"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
+	"${FILESDIR}"/${PN}-4.2.8-fno-common.patch
 )
 
 DOCS=( README.md )
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index e8e5c2814ed8..43d6c88ec8d1 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
 	"${FILESDIR}"/${PN}-4.2.7-python3.patch
 	"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
+	"${FILESDIR}"/${PN}-4.2.8-fno-common.patch
 )
 
 DOCS=( README.md )