gentoo auto-resync : 26:06:2023 - 19:33:07

4 files changed, 40 insertions, 94 deletions

diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 9b1f58d3abc9..d4b04430bc80 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,8 +1,7 @@
+AUX motion-4.5.1-fix-gettext-0.22-format-specifier.patch 956 BLAKE2B 4fb34190389d9373d7597bdaf0eea817c50a10d97f7e9782042eaf60c98f6c9dcaf64f8098c2a842973a6b0cd7749690b80084be1e7f208053269810a9373b46 SHA512 de2965174af33ce2a2254b8a4f784212869d2eb6ed8dafb1dfaa95f03e1d79d83878c4ad3ff0411f959a758a8a8cf58d516bdd0d1bed669e8357640c840f3919
 AUX motion.confd-r5 884 BLAKE2B 63c497e942ae499271504d308f826f23d718ac968f7735e340ef2fa8a7b1a64d63365686cc00137141bd4b788975c00b4ea3eaf38c1dd9bd219d3d50ff0da8e0 SHA512 998dcfe4160c90adf2683f0194fcf867f0062f1e54355c1158ecb9965a5ed2c30f362147ac9a915b42ba681184d91e78c3a1d397c4b92ee48440d00f3ac0df99
 AUX motion.initd-r5 1392 BLAKE2B 87ac71a1e75ace73ac28c52ff0b1d6bbce364e6d43ef8604f3b90c08646fcf4a66abb4d7b16170eb63e7f7f65e5155382c9bf12ff074feffd2c6f3f16479518c SHA512 0060c062e7ce7f3b9c6ae70d0d6830a1676d9a173072bb3464b42fc2bd595d6237524a1ea916f60268533087647e81eef3b39a1b086cf8e8970837d96e48146c
 AUX motion.service-r4 497 BLAKE2B 8941424317635d214e74d5d558a443212129c38fed9921b101bd3689d743ed6bd68e30748075ae8c5d26aa10732fc6ce1f08707c9ed559eb89a27322e57e0995 SHA512 44e0fa13e4d93af517a06bac5191d16d528648c6b3eb9d56f80e447db7ef46b311acf6fd1d2159a24fa22200be41bdc62eeef8670ddba918bdd28f6d710f90c0
-DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c
 DIST motion-release-4.5.1.tar.gz 856665 BLAKE2B 59ae638113c7f08ced4b18d7c4f19e3b3f1850ba0cd4c224b300be5ac65ae3b45aa391f26f506a91bb4c38a47b552c71db846d2b3217ccf0b2f5799873ab7ddb SHA512 3b8b60ad4f41c37cc215aa575b0295ee99b15f2d32cbf3393c0f7cdd8d87616cca1c00e11cb7bf74e4afa285caa094f08df3ba62ab21dcb28a48336e3ff5803e
-EBUILD motion-4.3.2-r3.ebuild 2243 BLAKE2B b1fde23db8979ee80015afdfcde2b71f5a6e6ef6b53ffbbf75ca6a968c7a366e4c2a426acae41419e8b5395c63af556d0f12973272a75bde9ddc8b8eca030b1c SHA512 c75db500acadfe4fcfc9bb01d68e6add38335b24fb61c0864101f1115622023e60ce684e39d0b3368a2935c00eec42c6e51a3ba63f732221abe45c46f2d783da
-EBUILD motion-4.5.1-r2.ebuild 2231 BLAKE2B cc49a918e4aeca262ace318774271fd222bc5f41019af79ef526cd97186c0a28cf10eb5eeb265b324c5f57f55ea9a16cb971414c7b6cb84520f49569dcaf1b3b SHA512 bb74f854d446943c14201b142846ca0f0bfc4ee95e1abcf93aa4ae68ae4d3ddafc26580ab9b0c28322d9d570bdaa8fbcfc551a38dc83a1a8caba568eb50da684
+EBUILD motion-4.5.1-r2.ebuild 2303 BLAKE2B 8a3100940820e1bf29711c1cbd7f09b6ca3408936757df1f55d3050dba33b1471ed853e0653f29e97a73f81194909f09820ce2ef728b08bf4f479c76138ec415 SHA512 84855758570248de10c989e035652bbe526edaa899a6af236ea17ab86ce04f46ae354314f309c565c5639d53332e43521a1fd73a9881f3997a5a55d0edf284c3
 MISC metadata.xml 766 BLAKE2B 1385dc89a2d67fc06b0c430b7cb6a606ce22af15c633edc78382e48bc14e423a2a4ff1553531e0e373151e48d2fed1ab78f9da67680fda3eea6b3d717b077d22 SHA512 8c944d3b1bb54b25597bae085b3fdc3da3ff3677eb97fee314558597917355a2fa4db4216720dc51aa171bb032eb426ae8b1d3c9bc5efed3662af75d8d49cc54
diff --git a/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch b/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch
new file mode 100644
index 000000000000..531fd3cf235a
--- /dev/null
+++ b/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch
@@ -0,0 +1,34 @@
+https://github.com/Motion-Project/motion/pull/1681
+
+From 6c00ca93d87229ee28b052af4a4b4aefad14499b Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 26 Jun 2023 19:56:18 +0200
+Subject: [PATCH 1/2] po: fix gettext 0.22 format specifier
+
+Bug: https://bugs.gentoo.org/908965
+Bug: https://savannah.gnu.org/bugs/index.php?64334#comment1
+--- a/po/de.po
++++ b/po/de.po
+@@ -3458,7 +3458,7 @@ msgstr "Sprache: Deutsch"
+ #: src/util.c
+ #, c-format
+ msgid "Could not allocate %llu bytes of memory!"
+-msgstr "%Llu Bytes Speicher konnten nicht zugeordnet werden!"
++msgstr "%llu Bytes Speicher konnten nicht zugeordnet werden!"
+ 
+ #: src/util.c
+ #, c-format
+--- a/po/fi.po
++++ b/po/fi.po
+@@ -3432,7 +3432,7 @@ msgstr "Kieli: englanti"
+ #: src/util.c
+ #, c-format
+ msgid "Could not allocate %llu bytes of memory!"
+-msgstr "%Llu-tavua muistia ei voitu varata!"
++msgstr "%llu-tavua muistia ei voitu varata!"
+ 
+ #: src/util.c
+ #, c-format
+-- 
+2.41.0
+
diff --git a/media-video/motion/motion-4.3.2-r3.ebuild b/media-video/motion/motion-4.3.2-r3.ebuild
deleted file mode 100644
index 68f6f12d35cc..000000000000
--- a/media-video/motion/motion-4.3.2-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-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 )
-	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}
-	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
-
-	newinitd "${FILESDIR}/motion.initd-r5" ${PN}
-	newconfd "${FILESDIR}/motion.confd-r5" ${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.5.1-r2.ebuild b/media-video/motion/motion-4.5.1-r2.ebuild
index 55cb4df6acd2..8e786bb8fe9e 100644
--- a/media-video/motion/motion-4.5.1-r2.ebuild
+++ b/media-video/motion/motion-4.5.1-r2.ebuild
@@ -8,6 +8,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"
+S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,6 +35,9 @@ DEPEND="${RDEPEND}
 		virtual/os-headers
 	)
 "
+
+PATCHES=( "${FILESDIR}"/${P}-fix-gettext-0.22-format-specifier.patch )
+
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 You need to setup a configuraton file (/etc/motion/motion.conf) before
@@ -51,8 +55,6 @@ To install motion as a service, use:
 - systemctl enable motion.service # with systemd
 "
 
-S="${WORKDIR}"/${PN}-release-${PV}
-
 src_prepare() {
 	default
 	eautoreconf