6 files changed, 3 insertions, 173 deletions
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 8f5c995d563f..439db39abecc 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,10 +1,6 @@
-AUX motion.confd-r4 773 BLAKE2B 1a7f0128ec385751d75152c4a36cc2afe57a36b55cd5efe5035af3e78df775edf11568f8bae3acbf7c986b967087cb8b633724bb08bbbf24a0102a082dc5a55f SHA512 4aff16be6fd77909751b034ada9611522acb3c8de0fd160fe67c415eb54cb63a8adad055972ffc3ea7428588a6f5673bb9b311be4660c180796d6067eb3c45e5
 AUX motion.confd-r5 884 BLAKE2B 63c497e942ae499271504d308f826f23d718ac968f7735e340ef2fa8a7b1a64d63365686cc00137141bd4b788975c00b4ea3eaf38c1dd9bd219d3d50ff0da8e0 SHA512 998dcfe4160c90adf2683f0194fcf867f0062f1e54355c1158ecb9965a5ed2c30f362147ac9a915b42ba681184d91e78c3a1d397c4b92ee48440d00f3ac0df99
-AUX motion.initd-r4 975 BLAKE2B a9f001318783f793474ef295d5724ff207d646051783d9927b2949c5c3adf65fef11ca63071f1401cab017ba1cf676f39bb2298b848e9f57185a1875c7e4c316 SHA512 ee0b471da01f7a7bb6a19fb974ec775e5d830b4970b5a690b2ba8043bddfe79245c72546d4a41b5d3bb50adbe03b79373ecc643161b50bd88386e66ee318b9ef
 AUX motion.initd-r5 1083 BLAKE2B cc013f9d529b722be26db8ead665380ce1724436f53e0131705bd99177d5f5eabaad939df78995be28d20f002753c7d43b382781660df3f56bf4126bb3cda75c SHA512 4106c502d75f6c5d58766d3bc784dc75b2a1ba0c4897093ed3afb6c1e5efc2032e150d657b8471e70f34ff932c4db93ef1adf55485159bd6906a4766fd5fb12e
 AUX motion.service-r4 462 BLAKE2B 3aeac7440cb545bbf7c41a59eb81260202e7783f701ed20ad33e8f69356bcc78ff7a23b3f518df7dc0ab0eb664d05b75e449afa7abbf1f993ad3c77b0eb83fb7 SHA512 2fbcdb381888d63d0becfc04473f915d75f97e267e4fb2bcf2554e53cbc302fd45b544b7c267a99a05540fb79ce4fcf3e3bc7e973fe08d0db5481e7728c02a1f
-DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
 DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c
-EBUILD motion-4.3.1.ebuild 2855 BLAKE2B 595ffa0920ab840308ca9562657532b61cf72d528a2bc976b384332d97ed255512710c142267479be2b04b7c255004d32ff230c5324871d7f85ba65281157667 SHA512 36bf969a4608a3156d1a798ae39f0df5d174d0557ff752dfdc060aa7e05e6146ff432827d0537b07231bdc922c8f886ef51c34a6f8f9097820ac177f239038fd
-EBUILD motion-4.3.2.ebuild 2234 BLAKE2B 7adc8b1b4b3b552fd80a5580bd2baa2969f28cd0d5df6712ca93836a362c085b12e6d6baa1af478adba2039f35ba21200a365ae27b6e41a0444f463791e39678 SHA512 c94be53b5ea1f5511b6dbd57f3bf815ed8e5a3e46c04f4b21d76683fcc95e34c14e2e296fb0e8310c9c90608681512330a77d5d7ad632a0d250c9ce2c4fb8026
-MISC metadata.xml 880 BLAKE2B eb7167f5b1c6cea244e553aad747ad114c46e1f8dad0d26c271afb7630ef88bea28e824c454913dc5a1f56e80ecba1ff7b518384eff503e06c18fa02ea80b13f SHA512 b44ede0bcef1053fb097cdb8f243ad8d9e17ee2ba627ceb1ca31a360b8d22f58d5fe43a81d0c81494916698f8c448d1254299c5358cef977405396846cda7320
+EBUILD motion-4.3.2-r1.ebuild 2236 BLAKE2B 387396f07ea1a7b287acd42683e8e7d5ab0485d6e2d9cda610eeeec4880f5c0513038de8f48555bc278ebc3e76bc78523c4d63f09ffd7e27fe2d7352c07d06d9 SHA512 24449e9617fab38423b61269325e549f349dcd7fd43d973d8b9b5fa29ee5b147914d711344ce90dc106773238038de7b35442bc3fb9a6874cf08850675796fb6
+MISC metadata.xml 765 BLAKE2B dd7f3c7c7fc7a1dfa9052eb1508bc6c1ab502fc284ea884918d56b0a497aeb13506764fc6237176bbc7fd5450e10cbd37b321b07b909e6c199226363dacf9dc0 SHA512 55c0c250f64a23c8b03615a9c8bd510bfbddc088cb1d485e0faaa071f0fe148fa8312915cbd08cce0eeda13d4398cc6bebae42bfba82cc81b9d13b51303cc32e
diff --git a/media-video/motion/files/motion.confd-r4 b/media-video/motion/files/motion.confd-r4
deleted file mode 100644
index 8a200d14928c..000000000000
--- a/media-video/motion/files/motion.confd-r4
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# Motion OpenRC conf.d file
-# All settings are optional
-
-# Set the user and group under which motion will be run
-#MOTION_USER="motion"
-#MOTION_GROUP="motion"
-
-#Set motion's config file:
-#MOTION_CONFIGFILE="/etc/motion/motion.conf"
-
-#Set motion's log file. Leave unset for syslog:
-#MOTION_LOGFILE="/var/log/motion/motion.log"
-
-#Set log type:  1-9 for COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL
-#MOTION_LOGTYPE="9"
-
-#Set log level: 1-9 for EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL
-#MOTION_LOGLEVEL="6"
-
-#Set a default dir where motion places its output
-#MOTION_DIR="/var/lib/motion"
-
-#Set the umask for the output files, for additonal security
-#MOTION_UMASK="007"
-
diff --git a/media-video/motion/files/motion.initd-r4 b/media-video/motion/files/motion.initd-r4
deleted file mode 100644
index 30d5e25cb08e..000000000000
--- a/media-video/motion/files/motion.initd-r4
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${MOTION_USER:="motion"}
-: ${MOTION_GROUP:="motion"}
-
-[ "${MOTION_UMASK}" ] && umask="${MOTION_UMASK}"
-[ "${MOTION_CONFIGFILE}" ] && command_args="-c ${MOTION_CONFIGFILE}"
-[ "${MOTION_LOGFILE}" ] && command_args="${command_args} -l ${MOTION_LOGFILE}"
-[ "${MOTION_LOGTYPE}" ] && command_args="${command_args} -k ${MOTION_LOGTYPE}"
-[ "${MOTION_LOGLEVEL}" ] && command_args="${command_args} -d ${MOTION_LOGLEVEL}"
-
-command=/usr/bin/motion
-command_user="${MOTION_USER}:${MOTION_GROUP}"
-
-start_pre() {
-  if [ "${MOTION_DIR}" ] ; then
-    mkdir -p "${MOTION_DIR}"
-    checkpath -d -o "${MOTION_USER}" "${MOTION_DIR}"
-    directory="${MOTION_DIR}"
-  fi
-  if [ "${MOTION_LOGFILE}" ] ; then
-    local LOGFILE=${MOTION_LOGFILE##*/}
-    local LOGDIR=${MOTION_LOGFILE%$LOGFILE} 
-    mkdir -p "${LOGDIR}"
-    checkpath -d -o "${MOTION_USER}" "${LOGDIR}"
-  fi
-}
-
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index 45dcbfba21ef..cec3a16a5f2f 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="mariadb">Add mariadb database support</flag>
 		<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
-		<flag name="supervise-daemon">Add experimental suppport for OpenRC's supervise-daemon process supervision</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Motion-Project/motion</remote-id>
diff --git a/media-video/motion/motion-4.3.1.ebuild b/media-video/motion/motion-4.3.1.ebuild
deleted file mode 100644
index fcb7435c91e5..000000000000
--- a/media-video/motion/motion-4.3.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd
-
-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 mariadb mmal mysql postgres sqlite supervise-daemon v4l webp"
-
-RDEPEND="
-	acct-group/motion
-	acct-user/motion
-	virtual/jpeg:=
-	ffmpeg? ( media-video/ffmpeg:0= )
-	mariadb? ( dev-db/mariadb-connector-c )
-	mmal? ( media-libs/raspberrypi-userland )
-	mysql? ( dev-db/mysql-connector-c )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="${RDEPEND}
-	net-libs/libmicrohttpd
-	v4l? (
-		media-libs/libv4l
-		virtual/os-headers
-	)
-"
-
-# Breaks src_install(), #727056
-RESTRICT="test"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need to setup a configuraton file (/etc/motion/motion.conf) before
-running motion for the first time.
-
-If motion is built with the mysql or mariadb use flags then please make
-sure to configure a matching database_type in the config file.
-
-Motion runs by default under user motion and group motion:
-- change this if needed in /etc/conf.d/motion
-- or add users who need access to the output files to the motion group
-
-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}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ffmpeg) \
-		$(use_with mariadb) \
-		$(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
-
-	# build INITDAD string cwto be added to initd based on use flags, eg
-	# "depend() {
-	#   use mysql
-	# }
-	#
-	# supervisor=supervise-daemon"
-	local INITDADJ=""
-	( use mysql || use mariadb ) && INITDADJ=" use mysql\n"
-	use postgres && INITDADJ="${INITDADJ}  use postgresql\n"
-	[ "${#INITDADJ}" -gt 0 ] && INITDADJ="depend() {\n${INITDADJ}}\n"
-	if use supervise-daemon ; then
-		INITDADJ="${INITDADJ}\nsupervisor=supervise-daemon\n"
-	else
-		INITDADJ="${INITDADJ}\npidfile=/run/\${RC_SVCNAME}.pid\ncommand_background=true\n"
-	fi
-	cp "${FILESDIR}/${PN}.initd-r4" "${T}/initd" || die
-	echo -e ${INITDADJ} >> "${T}/initd" || die
-
-	newinitd "${T}/initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	readme.gentoo_create_doc
-	readme.gentoo_print_elog
-}
diff --git a/media-video/motion/motion-4.3.2.ebuild b/media-video/motion/motion-4.3.2-r1.ebuild
index 10749fd8c447..19c0917b4e13 100644
--- a/media-video/motion/motion-4.3.2.ebuild
+++ b/media-video/motion/motion-4.3.2-r1.ebuild
@@ -17,6 +17,7 @@ IUSE="ffmpeg mariadb mmal mysql postgres sqlite v4l webp"
 RDEPEND="
 	acct-group/motion
 	acct-user/motion
+	net-libs/libmicrohttpd:=
 	virtual/jpeg:=
 	ffmpeg? ( media-video/ffmpeg:0= )
 	mariadb? ( dev-db/mariadb-connector-c )
@@ -27,7 +28,6 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )
 "
 DEPEND="${RDEPEND}
-	net-libs/libmicrohttpd
 	v4l? (
 		media-libs/libv4l
 		virtual/os-headers