Merge updates from master

14 files changed, 149 insertions, 208 deletions

diff --git a/app-admin/logstalgia/logstalgia-1.1.2.ebuild b/app-admin/logstalgia/logstalgia-1.1.2.ebuild
index be16497f71ac..d996c9d6102a 100644
--- a/app-admin/logstalgia/logstalgia-1.1.2.ebuild
+++ b/app-admin/logstalgia/logstalgia-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/acaudwell/Logstalgia/releases/download/${P}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/libpcre
 	media-libs/freetype:2
diff --git a/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild b/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
index c1c8bfccecec..9b54f5d50580 100644
--- a/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
+++ b/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,9 +27,9 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 src_prepare() {
 	default
 
-	sed -i -e "s:-O3:${CFLAGS}:" \
+	sed -i -e "s|-O3|${CFLAGS}|" \
 		src/tclx/config.mk src/{sim,tcl,tk}/makefile || die
-	sed -i -e "s:XLDFLAGS=:&${LDFLAGS}:" \
+	sed -i -e "s|XLDFLAGS=|&${LDFLAGS}|" \
 		src/tclx/config.mk || die
 }
 
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 2a6cd486f349..aaddcd33c162 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,5 +1,4 @@
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
-DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb1c6fadb5d602c4e34e373ee7a0df0801e6b68b0816ee819f77caef33bbc4b8490df1c8f01fd2fb35664fd3757 SHA512 b09962ec99ca1ce1eafd40409a00f976dc47d82adb707313f4516400db6439af8597a1c4e30262fb228c102508ede688912480dbb1dcca9721bb0333693f1d85
-DIST mailman-3.2.1.tar.gz 781654 BLAKE2B ee9a9bf5505ba638417c363a885153dbaa795213a77ca9dd5abb7212ac0fe35d08c5e0e87da2d54aeb50d21c30df72a750bd25ffa0877d377a3871bded03c7de SHA512 b17fa878ffe539504ce7f28351f5bf3c7aafe29fe98957880a571e5b798ad4f9f56748fb69df699b8bf9889aebb6cef075c5d075d653fa5e9b6feb0322eab9e6
 DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f
 DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8
+DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc
diff --git a/net-mail/mailman/mailman-3.1.1.ebuild b/net-mail/mailman/mailman-3.1.1.ebuild
deleted file mode 100644
index ebd8275e9c59..000000000000
--- a/net-mail/mailman/mailman-3.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="http://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-#KEYWORDS="~amd64 ~ppc ~x86"
-KEYWORDS=""  # nothing til this is finished
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	~dev-python/aiosmtpd-1.0[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-1.0.0[${PYTHON_USEDEP}]
-	dev-python/flufl-bounce[${PYTHON_USEDEP}]
-	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	dev-python/lazr-config[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-configuration[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
diff --git a/net-mail/mailman/mailman-3.2.1.ebuild b/net-mail/mailman/mailman-3.3.1.ebuild
index 108bd97f853c..f995b8d5bf69 100644
--- a/net-mail/mailman/mailman-3.2.1.ebuild
+++ b/net-mail/mailman/mailman-3.3.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="http://www.list.org"
+HOMEPAGE="https://www.list.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
@@ -22,15 +22,16 @@ RDEPEND="
 	>=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
 	dev-python/alembic[${PYTHON_USEDEP}]
 	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/authheaders-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
 	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
 	dev-python/flufl-bounce[${PYTHON_USEDEP}]
 	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	dev-python/importlib_resources[${PYTHON_USEDEP}]
+	>=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
 	dev-python/lazr-config[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
 	dev-python/passlib[${PYTHON_USEDEP}]
@@ -39,5 +40,5 @@ RDEPEND="
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-configuration[${PYTHON_USEDEP}]
 	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
 "
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index d49cd27e01d1..ed502b3d9790 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1,2 @@
 DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd
+DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96
diff --git a/net-misc/gerbera/files/gerbera-1.0.0.config b/net-misc/gerbera/files/gerbera-1.0.0.config
deleted file mode 100644
index 94bdb936e145..000000000000
--- a/net-misc/gerbera/files/gerbera-1.0.0.config
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
-  <server>
-    <ui enabled="yes" show-tooltips="yes">
-      <accounts enabled="no" session-timeout="30">
-        <account user="gerbera" password="mediatomb"/>
-      </accounts>
-    </ui>
-    <name>Gerbera</name>
-    <udn></udn>
-    <home>/var/lib/gerbera</home>
-    <webroot>/usr/share/gerbera/web</webroot>
-    <storage>
-      <sqlite3 enabled="yes">
-        <database-file>gerbera.db</database-file>
-      </sqlite3>
-      <mysql enabled="no">
-        <host>host</host>
-        <database>database</database>
-        <username>username</username>
-        <password>password</password>
-      </mysql>
-    </storage>
-    <protocolInfo extend="yes"/>
-    <pc-directory upnp-hide="no"/>
-    <extended-runtime-options>
-      <ffmpegthumbnailer enabled="no">
-        <thumbnail-size>160</thumbnail-size>
-        <seek-percentage>10</seek-percentage>
-        <filmstrip-overlay>no</filmstrip-overlay>
-        <workaround-bugs>no</workaround-bugs>
-        <image-quality>8</image-quality>
-      </ffmpegthumbnailer>
-      <mark-played-items enabled="no" suppress-cds-updates="yes">
-        <string mode="prepend">*</string>
-        <mark>
-          <content>video</content>
-        </mark>
-      </mark-played-items>
-      <lastfm enabled="no">
-        <username>username</username>
-        <password>password</password>
-      </lastfm>
-    </extended-runtime-options>
-  </server>
-  <import hidden-files="no">
-    <scripting script-charset="UTF-8">
-      <common-script>/usr/share/gerbera/js/common.js</common-script>
-      <playlist-script>/usr/share/gerbera/js/playlists.js</playlist-script>
-      <virtual-layout type="builtin">
-        <import-script>/usr/share/gerbera/js/import.js</import-script>
-      </virtual-layout>
-    </scripting>
-    <mappings>
-      <extension-mimetype ignore-unknown="no">
-        <map from="mp3" to="audio/mpeg"/>
-        <map from="ogx" to="application/ogg"/>
-        <map from="ogv" to="video/ogg"/>
-        <map from="oga" to="audio/ogg"/>
-        <map from="ogg" to="audio/ogg"/>
-        <map from="ogm" to="video/ogg"/>
-        <map from="asf" to="video/x-ms-asf"/>
-        <map from="asx" to="video/x-ms-asf"/>
-        <map from="wma" to="audio/x-ms-wma"/>
-        <map from="wax" to="audio/x-ms-wax"/>
-        <map from="wmv" to="video/x-ms-wmv"/>
-        <map from="wvx" to="video/x-ms-wvx"/>
-        <map from="wm" to="video/x-ms-wm"/>
-        <map from="wmx" to="video/x-ms-wmx"/>
-        <map from="m3u" to="audio/x-mpegurl"/>
-        <map from="pls" to="audio/x-scpls"/>
-        <map from="flv" to="video/x-flv"/>
-        <map from="mkv" to="video/x-matroska"/>
-        <map from="mka" to="audio/x-matroska"/>
-        <map from="avi" to="video/divx"/>
-        <map from="m2ts" to="video/avc"/>
-        <map from="cr2" to="image/raw"/>
-        <map from="nef" to="image/raw"/>
-      </extension-mimetype>
-      <mimetype-upnpclass>
-        <map from="audio/*" to="object.item.audioItem.musicTrack"/>
-        <map from="video/*" to="object.item.videoItem"/>
-        <map from="image/*" to="object.item.imageItem"/>
-      </mimetype-upnpclass>
-      <mimetype-contenttype>
-        <treat mimetype="audio/mpeg" as="mp3"/>
-        <treat mimetype="application/ogg" as="ogg"/>
-        <treat mimetype="video/ogg" as="ogg"/>
-        <treat mimetype="audio/ogg" as="ogg"/>
-        <treat mimetype="audio/x-flac" as="flac"/>
-        <treat mimetype="image/jpeg" as="jpg"/>
-        <treat mimetype="audio/x-mpegurl" as="playlist"/>
-        <treat mimetype="audio/x-scpls" as="playlist"/>
-        <treat mimetype="audio/x-wav" as="pcm"/>
-        <treat mimetype="audio/L16" as="pcm"/>
-        <treat mimetype="video/x-msvideo" as="avi"/>
-        <treat mimetype="video/mp4" as="mp4"/>
-        <treat mimetype="audio/mp4" as="mp4"/>
-        <treat mimetype="video/divx" as="avi"/>
-      </mimetype-contenttype>
-    </mappings>
-    <online-content>
-      <YouTube enabled="no" refresh="28800" update-at-start="yes" purge-after="604800" racy-content="exclude" format="mp4" hd="no">
-        <favorites user="NationalGeographic"/>
-        <playlists user="PlayStation"/>
-        <uploads user="Google"/>
-        <standardfeed feed="most_viewed" time-range="today"/>
-        <standardfeed feed="recently_featured" time-range="today"/>
-      </YouTube>
-    </online-content>
-  </import>
-  <transcoding enabled="no">
-    <mimetype-profile-mappings>
-      <transcode mimetype="audio/ogg" using="audio2pcm"/>
-      <transcode mimetype="audio/x-flac" using="audio2pcm"/>
-      <transcode mimetype="video/ogg" using="video2mpeg"/>
-      <transcode mimetype="video/x-flv" using="video2mpeg"/>
-    </mimetype-profile-mappings>
-    <profiles>
-      <profile name="audio2pcm" enabled="yes" type="external">
-        <mimetype>audio/L16</mimetype>
-        <accept-url>no</accept-url>
-        <first-resource>yes</first-resource>
-        <hide-original-resource>yes</hide-original-resource>
-        <accept-ogg-theora>no</accept-ogg-theora>
-        <sample-frequency>44100</sample-frequency>
-        <audio-channels>2</audio-channels>
-        <agent command="ffmpeg" arguments="-i %in -acodec pcm_s16be -ab 192k -ar 44100 -ac 2 -f s16be -y %out"/>
-        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
-      </profile>
-      <profile name="video2mpeg" enabled="yes" type="external">
-        <mimetype>video/mpeg</mimetype>
-        <accept-url>no</accept-url>
-        <first-resource>yes</first-resource>
-        <hide-original-resource>yes</hide-original-resource>
-        <accept-ogg-theora>yes</accept-ogg-theora>
-        <sample-frequency>48000</sample-frequency>
-        <audio-channels>2</audio-channels>
-        <agent command="ffmpeg" arguments="-i %in -vcodec mpeg2video -b 4096k -r 25 -acodec mp2 -ab 192k -ar 48000 -ac 2 -async 1 -f dvd -threads 2 -y %out"/>
-        <buffer size="10485760" chunk-size="262144" fill-size="524288"/>
-      </profile>
-    </profiles>
-  </transcoding>
-</config>
diff --git a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
new file mode 100644
index 000000000000..93fd9e198dfb
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
@@ -0,0 +1,25 @@
+From 5ebc80d64bc651a3cd5de0e92f1e607b8f8ea407 Mon Sep 17 00:00:00 2001
+From: Ian Whyman <ian@gerbera.io>
+Date: Sat, 9 May 2020 11:22:47 +0100
+Subject: [PATCH] Fix incomplete type iohandler with Ninja generator
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+error: invalid application of ‘sizeof’ to incomplete type ‘IOHandler’
+---
+ src/metadata/ffmpeg_handler.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/metadata/ffmpeg_handler.h b/src/metadata/ffmpeg_handler.h
+index 7c134430..565ff773 100644
+--- a/src/metadata/ffmpeg_handler.h
++++ b/src/metadata/ffmpeg_handler.h
+@@ -42,6 +42,7 @@
+ namespace fs = std::filesystem;
+ 
+ #include "metadata_handler.h"
++#include "iohandler/io_handler.h"
+ 
+ // forward declaration
+ class AVFormatContext;
diff --git a/net-misc/gerbera/gerbera-1.5.0.ebuild b/net-misc/gerbera/gerbera-1.5.0.ebuild
new file mode 100644
index 000000000000..3e0553c702d6
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.5.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils linux-info systemd tmpfiles
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server"
+HOMEPAGE="https://gerbera.io"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
+
+DEPEND="
+	acct-user/gerbera
+	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/spdlog
+	dev-libs/pugixml
+	dev-libs/libfmt:0/6
+	mysql? ( dev-db/mysql-connector-c )
+	javascript? ( dev-lang/duktape )
+	taglib? ( >=media-libs/taglib-1.11 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	exiv2? ( media-gfx/exiv2 )
+	ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl )
+	magic? ( sys-apps/file )
+	matroska? ( media-libs/libmatroska )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=(
+	"${FILESDIR}/${P}-incomplete-type-iohandler.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CURL="$(usex curl)" \
+		-DWITH_DEBUG="$(usex debug)" \
+		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
+		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+		-DWITH_JS="$(usex javascript)" \
+		-DWITH_LASTFM="$(usex lastfm)" \
+		-DWITH_MAGIC="$(usex magic)" \
+		-DWITH_MATROSKA="$(usex matroska)" \
+		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "Gerbera has been built with MySQL support and needs"
+		elog "to be configured before being started. By default"
+		elog "SQLite will be used."
+	fi
+}
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 11919c4298cf..adb30342a7ad 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -25,9 +25,11 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic
 
 DEPEND="
 	acct-user/gerbera
-	>=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr]
+	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
-	dev-libs/expat
+	dev-libs/spdlog
+	dev-libs/pugixml
+	dev-libs/libfmt:0/6
 	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )
@@ -36,9 +38,9 @@ DEPEND="
 	exiv2? ( media-gfx/exiv2 )
 	ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl net-misc/youtube-dl )
+	curl? ( net-misc/curl )
 	magic? ( sys-apps/file )
-	matroska? (	media-libs/libmatroska )
+	matroska? ( media-libs/libmatroska )
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/libiconv
diff --git a/net-news/canto-curses/Manifest b/net-news/canto-curses/Manifest
index c1bda7448cb4..119004758198 100644
--- a/net-news/canto-curses/Manifest
+++ b/net-news/canto-curses/Manifest
@@ -1 +1 @@
-DIST canto-curses-0.9.3.tar.gz 77748 BLAKE2B 7da3e9a3e12ba0216d67fe75ea4ad1e9e528ddc2289d187bfab4a43a09831535c8d5b86fa48f5784f5031b5a8a5783a65a9083a66b3d56658408db7276033466 SHA512 547061439e5d5a7f2bcb1643cc597578161f3c3c284520326fe483f79a60650e9b8b1c7cf5a5e1f165f13510e7cab893b77968b5995c66b572c0bb605b6ebaaa
+DIST canto-curses-0.9.9.tar.gz 79963 BLAKE2B c6154dfa71ec88b405fb89feec66a6bb922dfb93523c865c33fe0664ed7ea796d795027ff65a355fd3767342ffd5fa8cb01f48475c262ded4413924df6339509 SHA512 2a88631506c1fda7278bb3ac376c2b67b4f2e5e1f443e49fe3035f542b66ac4b232fa66e7ae1b40e86b0a5cde3c38d11a0953754e5c5c7ed572a0da74656d798
diff --git a/net-news/canto-curses/canto-curses-0.9.3.ebuild b/net-news/canto-curses/canto-curses-0.9.9.ebuild
index d125ebcb65ce..aebb0706e41e 100644
--- a/net-news/canto-curses/canto-curses-0.9.3.ebuild
+++ b/net-news/canto-curses/canto-curses-0.9.9.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="ncurses(+),threads(+)"
 inherit distutils-r1 multilib
 
 DESCRIPTION="The ncurses client for canto-daemon"
 HOMEPAGE="https://codezen.org/canto-ng/"
-SRC_URI="https://codezen.org/static/${P}.tar.gz"
+SRC_URI="https://github.com/themoken/canto-curses/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-news/canto-daemon/Manifest b/net-news/canto-daemon/Manifest
index 374426378e56..c41f450f054d 100644
--- a/net-news/canto-daemon/Manifest
+++ b/net-news/canto-daemon/Manifest
@@ -1 +1 @@
-DIST canto-daemon-0.9.1.tar.gz 49316 BLAKE2B 9e19dfe348b915735f81a74d7eed21a2c442c2f16d7c78c881ed06db6079154921a34e39b5b28fd17ccae7a626ef2f931b169f35bb15a29b091ec3a444acf4e0 SHA512 88e708c92813ddda44a8ea6a5d21722510822f22ebc0a4fb4165e6793ea50d89b139a51a4b1e06f811d7073c6b103590b52e4299c674f904e8b5aae7645484fd
+DIST canto-daemon-0.9.7.tar.gz 53833 BLAKE2B 148929d610ccde11d32295b585e7ff01d847e4fbf8e9d0bea63fdf2c38b3474f958ff99a2667624b08ab90e004023659b9f4aa0477a67ed5b6e218eac4b2eedc SHA512 8c8c73cb6bc7455620abd299dfa0350ea5b8ec0e04d7ccdb1dd8ee2a6de51d0a0ba3934d66141dc899d28e49993c87002a936659f9c31b3c416ee294f9b616b9
diff --git a/net-news/canto-daemon/canto-daemon-0.9.1.ebuild b/net-news/canto-daemon/canto-daemon-0.9.7.ebuild
index a5006ea04687..b7c139a520be 100644
--- a/net-news/canto-daemon/canto-daemon-0.9.1.ebuild
+++ b/net-news/canto-daemon/canto-daemon-0.9.7.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+),threads(+)"
 inherit distutils-r1 multilib
 
 DESCRIPTION="Daemon part of Canto-NG RSS reader"
 HOMEPAGE="https://codezen.org/canto-ng/"
-SRC_URI="https://codezen.org/static/${P}.tar.gz"
+SRC_URI="https://github.com/themoken/canto-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"