gentoo resync : 17.07.2021

7 files changed, 89 insertions, 15 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index dd95c459fbdf..da17c265deff 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 5bb8c8fa7472..967efe50d9cd 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,5 +1,4 @@
 AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
-AUX handbrake-1.3.2-x265-link.patch 585 BLAKE2B aa46591f144e787212194e937ea594f29b55cac79c7bb659010775c09a4c5e1d9b1345047b377a6bfc0db5ee17e57a41670ad72373f0d01d390cf21b1d2c10b4 SHA512 ea13eab2a080f1d0080247f5a25cb09e2d495077caddd2ad3ce473f79d7bc611795dd1e13847cd982b0a19eddfddc96dbdd3deae8928bb9597d1a6627f17396a
 AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
deleted file mode 100644
index 589a204cc195..000000000000
--- a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/test/module.defs b/test/module.defs
---- a/test/module.defs	2020-05-23 17:23:21.912103481 +0200
-+++ b/test/module.defs	2020-05-23 17:23:36.106103799 +0200
-@@ -16,7 +16,7 @@
- TEST.GCC.l = \
-         ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
-         dvdread fribidi \
--        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
-+        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
-         bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
- 
- ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 8bb9284a4aee..eee6bcf9b434 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -3,4 +3,5 @@ AUX unifi-video.initd 467 BLAKE2B c68d4b1efc3a2583e8624d306d667585022d27aa0ad4f2
 AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee2843364283da712e46f8fb1d1fcb9ce7b3f042938a55cf3689c7976095ed2f5e72b71bb915ae8a32763d SHA512 ea6eb21bc15c887f4f5e27669bb72eb31db9d8af48d9efdfc32901f1eeff2fb1626ce161dab2bf636eabd4a49c16966cfc55dcd8e572f01a829f491248f7b474
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2
 EBUILD unifi-video-3.10.13-r2.ebuild 1965 BLAKE2B 21f735f65e95f3d0f0169a7be009d43b9a1525318faa50d9639264bba9c23a119a3bedc255a1bc7881dc94cad9346decb3acdf473732ab87ffe75caa31d8dcb6 SHA512 5c0d9af2a50cdbf82029e1b6aefad026779592828ca99a1223b1602886b078bcf383197f4a1299d7ebffbbd74b67abcbac93f911a73170cd3ec112ec85e48b32
+EBUILD unifi-video-3.10.13-r3.ebuild 1965 BLAKE2B fc71df9184fea92ec66910f36815bcffffc4869d52eb112ff56806942dc442dedfd1097c5983f669f424ccbec9f0cf3bce44bd67c3f57ba41939fc6e1b7f7d2f SHA512 d174900c49e91eed75d41526d63f36c3a055087ec1b1b042a90ed63c2a7a3b7d651a0a755a9d73489da375db3bff9b95b13d33e7abde29463d42c73bc9a3d23a
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild b/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
new file mode 100644
index 000000000000..a86ef7450ebd
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.13-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="acct-group/unifi-video
+	acct-user/unifi-video"
+RDEPEND="${DEPEND}
+	dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	export CODEPATH=/usr/lib/${PN}
+	export DATAPATH=/var/lib/${PN}
+	LOGPATH=${DATAPATH}/logs
+	VARLOGPATH=/var/log/${PN}
+
+	insinto /usr/lib
+	doins -r .${CODEPATH}
+	into /usr
+	dosbin usr/sbin/unifi-video
+
+	dodir ${LOGPATH}
+	fowners -R ${PN}:${PN} ${DATAPATH}
+	dosym ${LOGPATH} ${VARLOGPATH}
+	dosym ${LOGPATH} ${CODEPATH}/logs
+
+	dosym ${DATAPATH} ${CODEPATH}/data
+
+	fperms 500 ${CODEPATH}/bin/ubnt.avtool
+	fperms 500 ${CODEPATH}/bin/evostreamms
+	fperms 500 /usr/sbin/${PN}
+	fowners -R ${PN}:${PN} ${CODEPATH}
+	fperms -R 0400 ${CODEPATH}/lib/
+	fperms 500 ${CODEPATH}/lib/
+
+	echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	dosym ../../../bin/mongod ${CODEPATH}/bin/mongod
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	if [[ ! -f ${DATAPATH}/system.properties ]]; then
+		cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
+		echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
+	fi
+}
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 1967d03031d2..df5b5552297e 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -33,5 +33,5 @@ EBUILD vdr-2.2.0-r6.ebuild 8168 BLAKE2B 4965d23936592348a37cdba6c6b89e0f651780b3
 EBUILD vdr-2.2.0-r7.ebuild 8210 BLAKE2B 004d8448d54dfe58ca1e83d6e1cfd9b84a22e8b0bb837900eba90666d55d4aae91e2e2d55095ab68665af104f52010b10268f5f730f451cedb54570d0271f8e9 SHA512 ca05beee04a50a8af95e4a990050c3430ac5a5829d4162e9c35f29bfd14deff2aa70e6ce6fcee10ceb506c48eca6a5bc15c418894e6d23ad5fb9d58da594e638
 EBUILD vdr-2.4.1-r3.ebuild 6090 BLAKE2B 5fa4d91be87dbd1edd93eced6f6f2c8916777fe8ded5472e15b0ec9ef19f817646eb82261965b7a2757887821e1282c7513c4aa06ca67f7825009a8f7f664368 SHA512 5b38708119e60fd4d87c8640952b16532c2df18b8541c64395e4c953ecf553631e85539b21c458f83eb4511be243d25486ebb21e85ad1fee6e153c12e3d687f8
 EBUILD vdr-2.4.6-r1.ebuild 5997 BLAKE2B 503afbd4a766bd4b050f05e74fe9ee9cef98718077eae7b34478e413d93ecdd97721813d6551ea4367a9c8eea9776bbfacd627ae110349fa7b1d4e7688d6ff9d SHA512 eaf2e9d0e2dd6c67b44d124261737fd4ba4ffcfe33550e951c93fae350b443556fc47ff5ddd343aeeda83fe890ea5f12a1eb6987505dd3af028929637c63f09f
-EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 7d0bd4f3d09e2f531b250af3a882fee46bd93d2883fd7464f38daa39d441e3fa0c7f7b642b6ee08020da076e3047b31203c8d3ea9d1fec1b0466bbbd69074a9b SHA512 a5bb20d7b4e606ed2728e10657c20bbf02828f15144715cfdffc182169dfc7a8bc1fe3347da2692c7ed4d53327a5690f77778dcb3abe25f6a7f36a105a6ad3d7
+EBUILD vdr-2.4.7-r1.ebuild 6169 BLAKE2B 006d0156bebd83ad5200e0f6587e3252d85fc0818203915c5af3d27e0f3e0b5f99cf272f11f855a344535be6dc4cc8a121a424369fda6bf5cb941a295e48642d SHA512 702c24d7dfda3d4664432ae93b5bfcc063093fb9e5fca2b2f8fd26f1daf8283a9a1dde0028d6a23ba97acf4a5cb3576c4234d7461e9e17c379bdcc8bdb5f4192
 MISC metadata.xml 1892 BLAKE2B 2a233ceb745f8df9350e37d99d8dce2cc56d3c21e0d187de483a2d2d18c0129a047d48cf7cddff7ea2500ae044d1eb196efb508cce0424368e03bbddb75c6d82 SHA512 dba266e22f0d99b98284db088beaf4fbd288cb8eee046a5f96610ed6cd748a116a3ced7ce74c69660d9943a7f7ccc016ba8a242174780275334b95a1ad4489c7
diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.4.7-r1.ebuild
index a0e8811b5dbf..0e8eed4d4ee5 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="