gentoo resync : 25.11.2020

3 files changed, 2 insertions, 95 deletions

diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index ea41b1a5cbfe..859e098cea62 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -6,8 +6,6 @@ AUX motion.initd-r3 1163 BLAKE2B 1926b3468c1b49651377c2704fe8f5cb65c9eed5a4bd11e
 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.1.1.tar.gz 447795 BLAKE2B 8c7dfdad89f49ba8ec39689d268b4bc95c6a8bd85d4bd333f66638b2e815b3c59b2e42dd93811601b2ee7870100a0a21eaa789633056f74a5cc9f39f4f92229f SHA512 3b08d464f9243ccfc4b53b16cfc2001d1e0d206bf0295d55d8914914bc14ad0248ce5ac622cb7eb89ed32e1913a9a10add1b56497c4094ba876f7f85d6ad4143
 DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
-EBUILD motion-4.1.1-r1.ebuild 2147 BLAKE2B e777945ae02d5ce78163e263a57285b285a0f6f0b16ead212b35282ff9f363f44ca8ed97dcdbcfac39eb83d4ce29cae69b8dd7ac452afdb391f03583343e2367 SHA512 c2a33ccbc3c7e234084a6c1485357bd389e44f0312fbfaad91dee899248da85328a7df513bfc53aa3d6ccbfa3ba635731452984d718dfe665998416b7c9f3238
-EBUILD motion-4.3.1.ebuild 2857 BLAKE2B 2f96411a45c56934371879ffc3e93f719c7502d831c06e949e15d42a732476444ae2a2bcee87efb4b7177a1a8b7909ab908cf1d4aeb3cd996f1cc3dcfebd1416 SHA512 10df83a2b553e3f35e7b1f7a61827550fd2b4baa258d55b1eb72f0df518f833114e61690498dbd67c74a9a36bde66bc702b72585533138323abc865d74384f4f
+EBUILD motion-4.3.1.ebuild 2855 BLAKE2B 595ffa0920ab840308ca9562657532b61cf72d528a2bc976b384332d97ed255512710c142267479be2b04b7c255004d32ff230c5324871d7f85ba65281157667 SHA512 36bf969a4608a3156d1a798ae39f0df5d174d0557ff752dfdc060aa7e05e6146ff432827d0537b07231bdc922c8f886ef51c34a6f8f9097820ac177f239038fd
 MISC metadata.xml 850 BLAKE2B b9ead6c9f74bb359c2bb282c0f6f8c33707fbd42aa458314c93bc754e2f707dc51fcfe5e0e0e2216af8435c2aa10d9e1c5885a838236b1ea274453c84f95f303 SHA512 419521643cbaefd58973bc764594ec44fdc927890c837eda0733af575073a8655e58da76f4a22467ae1d014898d828b84e9de85bb442cd9505911af1a04395b1
diff --git a/media-video/motion/motion-4.1.1-r1.ebuild b/media-video/motion/motion-4.1.1-r1.ebuild
deleted file mode 100644
index e751c82097a2..000000000000
--- a/media-video/motion/motion-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools readme.gentoo-r1 systemd user
-
-DESCRIPTION="A software motion detector"
-HOMEPAGE="https://motion-project.github.io"
-SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="ffmpeg mmal mysql postgres sqlite v4l webp"
-
-RDEPEND="
-	virtual/jpeg:=
-	ffmpeg? ( media-video/ffmpeg:0= )
-	mmal? ( media-libs/raspberrypi-userland )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="${RDEPEND}
-	v4l? (
-		media-libs/libv4l
-		virtual/os-headers
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}/Fix-build-errors-with-FFmpeg-4.0.patch
-)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need to setup /etc/motion/motion.conf before running motion for the
-first time. You can use /etc/motion/motion-dist.conf as a template.
-Please note that the 'daemon' and 'process_id_file' settings are
-overridden by the bundled OpenRC init script and systemd unit where
-appropriate.
-
-To install motion as a service, use:
-rc-update add motion default # with OpenRC
-systemctl enable motion.service # with systemd
-"
-
-S="${WORKDIR}"/${PN}-release-${PV}
-
-pkg_setup() {
-	enewuser ${PN} -1 -1 -1 video
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ffmpeg) \
-		$(use_with mmal) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3) \
-		$(use_with v4l v4l2) \
-		$(use_with webp) \
-		--without-optimizecpu
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		examplesdir=/usr/share/doc/${PF}/examples \
-		install
-
-	newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
-
-	keepdir /var/lib/motion
-	fowners motion:video /var/lib/motion
-	fperms 0750 /var/lib/motion
-
-	readme.gentoo_create_doc
-	readme.gentoo_print_elog
-}
diff --git a/media-video/motion/motion-4.3.1.ebuild b/media-video/motion/motion-4.3.1.ebuild
index efd01fca9653..fcb7435c91e5 100644
--- a/media-video/motion/motion-4.3.1.ebuild
+++ b/media-video/motion/motion-4.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="ffmpeg mariadb mmal mysql postgres sqlite supervise-daemon v4l webp"
 
 RDEPEND="