gentoo resync : 14.12.2020

6 files changed, 0 insertions, 131 deletions

diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 859e098cea62..f6eac22d5078 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,10 +1,5 @@
-AUX 4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch 1768 BLAKE2B d2ec71166a4c3779007aabd975e3bd003b17713ff1bcd3c94e57183936c5f6fc24abd6ed5231dca94d1d37f66db7a13358c5dc52795200d190d848f0360ec1e6 SHA512 bee1af2f32215b2abc006b9f12c77e138dbe9bb2de41ae9f1022b6c10340cb8e2eb2831459b241c44e3a0789a9df81b7227dfc07beb3e7e3af6f718fb4a4c56d
-AUX motion.conf 37 BLAKE2B 0a30bc830b519022f8c3bfdedb274329ecb506f3b3e42fb3de1f61513b9ef86c7884a9298c17b19b4afbb83b33ceb4f35f85fd377775e2485bbbfa2feb76833e SHA512 06e2dd29b946f35c78e7cf0ddeca727ca7f3f84e57e38b6688b2a493d487061ea6c959c5b365305a7813e0d3315f719003c681c26265566f46faa6ff88606853
-AUX motion.confd-r1 272 BLAKE2B bb395beafecf0498158ff0358b489ab251d79e005148715ef89ea882dec945f82faec60c2650e703d4db82e0bef3ccc8abd9768adf23dc8df5161f7fd8f24714 SHA512 8a67b5b0360924e58ba3136a737ce73bb43201a49b2b6e2c632426561b830f6ab55cbbeaa89be7f1683aa8fd322b4f31b9f560e67a93eaceb964c9f56ceef363
 AUX motion.confd-r4 773 BLAKE2B 1a7f0128ec385751d75152c4a36cc2afe57a36b55cd5efe5035af3e78df775edf11568f8bae3acbf7c986b967087cb8b633724bb08bbbf24a0102a082dc5a55f SHA512 4aff16be6fd77909751b034ada9611522acb3c8de0fd160fe67c415eb54cb63a8adad055972ffc3ea7428588a6f5673bb9b311be4660c180796d6067eb3c45e5
-AUX motion.initd-r3 1163 BLAKE2B 1926b3468c1b49651377c2704fe8f5cb65c9eed5a4bd11efe365aa01b9acd5300d7dae2f22c93748c2e1c1c49be9d707ad7d1c14d49dc092f18e6ddfe0e06ac5 SHA512 7c7201768fd868f851bb35b8df5e22d43688f1729178fd94d10f21436db6d5c178811bcef8b51c5b79b426bb92d542892edd65ee0414acaa799639a3a226934e
 AUX motion.initd-r4 975 BLAKE2B a9f001318783f793474ef295d5724ff207d646051783d9927b2949c5c3adf65fef11ca63071f1401cab017ba1cf676f39bb2298b848e9f57185a1875c7e4c316 SHA512 ee0b471da01f7a7bb6a19fb974ec775e5d830b4970b5a690b2ba8043bddfe79245c72546d4a41b5d3bb50adbe03b79373ecc643161b50bd88386e66ee318b9ef
-AUX motion.service 358 BLAKE2B 8f118322ec347472d1aec2d89e37335ecce594b1c0f194b3adfad3ce3d68cb5d6f4db6f2f932769e4adbc3b3c2094e1426f1d7c64d3985267a4558f549d6f4ed SHA512 b87bb9edd8d3b53e14eb0292358d05ea6c81f25c9d2b5b2208b5208ba57054dec64e1057f3bfbf5b2b490f643bd2ee497da038aad56e1274b9bf513f1366c8ca
 AUX motion.service-r4 462 BLAKE2B 3aeac7440cb545bbf7c41a59eb81260202e7783f701ed20ad33e8f69356bcc78ff7a23b3f518df7dc0ab0eb664d05b75e449afa7abbf1f993ad3c77b0eb83fb7 SHA512 2fbcdb381888d63d0becfc04473f915d75f97e267e4fb2bcf2554e53cbc302fd45b544b7c267a99a05540fb79ce4fcf3e3bc7e973fe08d0db5481e7728c02a1f
 DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
 EBUILD motion-4.3.1.ebuild 2855 BLAKE2B 595ffa0920ab840308ca9562657532b61cf72d528a2bc976b384332d97ed255512710c142267479be2b04b7c255004d32ff230c5324871d7f85ba65281157667 SHA512 36bf969a4608a3156d1a798ae39f0df5d174d0557ff752dfdc060aa7e05e6146ff432827d0537b07231bdc922c8f886ef51c34a6f8f9097820ac177f239038fd
diff --git a/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch b/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
deleted file mode 100644
index 641d68a8d0c5..000000000000
--- a/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9a9e918ec819277c6c5c2f21b52dd63570e426a7 Mon Sep 17 00:00:00 2001
-From: James Cowgill <jcowgill@users.noreply.github.com>
-Date: Sun, 25 Feb 2018 20:13:57 +0000
-Subject: [PATCH] Fix build errors with FFmpeg 4.0
-
----
- ffmpeg.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/ffmpeg.c b/ffmpeg.c
-index b2780bb..23644db 100644
---- a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -67,6 +67,19 @@
- 
- #endif
- 
-+/*********************************************/
-+#if (LIBAVCODEC_VERSION_MAJOR >= 57)
-+
-+#define MY_CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-+#define MY_CODEC_FLAG_QSCALE        AV_CODEC_FLAG_QSCALE
-+
-+#else
-+
-+#define MY_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#define MY_CODEC_FLAG_QSCALE        CODEC_FLAG_QSCALE
-+
-+#endif
-+
- /*********************************************/
- AVFrame *my_frame_alloc(void){
-     AVFrame *pic;
-@@ -538,7 +551,7 @@ static int ffmpeg_set_quality(struct ffmpeg *ffmpeg){
-         /* The selection of 8000 in the else is a subjective number based upon viewing output files */
-         if (ffmpeg->vbr > 0){
-             ffmpeg->vbr =(int)(((100-ffmpeg->vbr)*(100-ffmpeg->vbr)*(100-ffmpeg->vbr) * 8000) / 1000000) + 1;
--            ffmpeg->ctx_codec->flags |= CODEC_FLAG_QSCALE;
-+            ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_QSCALE;
-             ffmpeg->ctx_codec->global_quality=ffmpeg->vbr;
-         }
-     }
-@@ -663,7 +676,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){
-       ffmpeg->ctx_codec->strict_std_compliance = -2;
-       ffmpeg->ctx_codec->level = 3;
-     }
--    ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+    ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_GLOBAL_HEADER;
- 
-     retcd = ffmpeg_set_quality(ffmpeg);
-     if (retcd < 0){
--- 
-2.16.2
-
diff --git a/media-video/motion/files/motion.conf b/media-video/motion/files/motion.conf
deleted file mode 100644
index f032d874f0ca..000000000000
--- a/media-video/motion/files/motion.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/motion/ 0750 motion video
diff --git a/media-video/motion/files/motion.confd-r1 b/media-video/motion/files/motion.confd-r1
deleted file mode 100644
index dfff31beb45d..000000000000
--- a/media-video/motion/files/motion.confd-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set the user and group under which motion will be run
-MOTION_USER="motion"
-MOTION_GROUP="video"
-
-# Set the the directory for storing the pidfile
-MOTION_RUN_DIR="/var/run/motion"
-
-# Set the the working directory for storing images/videos
-MOTION_LIB_DIR="/var/lib/motion"
diff --git a/media-video/motion/files/motion.initd-r3 b/media-video/motion/files/motion.initd-r3
deleted file mode 100644
index 2b474fc56f9a..000000000000
--- a/media-video/motion/files/motion.initd-r3
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
-	need modules
-	after mysql
-}
-
-checkconfig() {
-	export MOTION_RUN_DIR="${MOTION_RUN_DIR:-/var/run/motion}"
-	checkpath -d -m 750 -o "${MOTION_USER:-motion}:${MOTION_GROUP:-video}" "${MOTION_RUN_DIR}"
-	export MOTION_LIB_DIR="${MOTION_LIB_DIR:-/var/lib/motion}"
-	checkpath -d -m 750 -o "${MOTION_USER:-motion}:${MOTION_GROUP:-video}" "${MOTION_LIB_DIR}"
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting motion detection"
-	start-stop-daemon --start -u "${MOTION_USER}" -g "${MOTION_GROUP}" -d "${MOTION_LIB_DIR}" --quiet --exec /usr/bin/motion -- -b -p "${MOTION_RUN_DIR}/motion.pid"
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-	ebegin "Stopping motion detection"
-	start-stop-daemon --stop --quiet --exec /usr/bin/motion --pidfile "${MOTION_RUN_DIR}/motion.pid"
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading motion detection configuration"
-	start-stop-daemon --stop --signal HUP --exec /usr/bin/motion --pidfile "${MOTION_RUN_DIR}/motion.pid"
-	eend $?
-}
diff --git a/media-video/motion/files/motion.service b/media-video/motion/files/motion.service
deleted file mode 100644
index d4755bdb48ea..000000000000
--- a/media-video/motion/files/motion.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Motion detection daemon
-After=local-fs.target network.target
-Documentation=man:motion(1)
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
-StandardError=null
-
-#User=motion
-Group=video
-
-#RuntimeDirectory=motion
-#RuntimeDirectoryMode=0750
-
-#WorkingDirectory=/var/lib/motion
-
-[Install]
-WantedBy=multi-user.target