gentoo resync : 06.04.2022

4 files changed, 57 insertions, 21 deletions

diff --git a/app-misc/qcma/Manifest b/app-misc/qcma/Manifest
index a10ff2ca69fc..c4c8c4af159c 100644
--- a/app-misc/qcma/Manifest
+++ b/app-misc/qcma/Manifest
@@ -1,6 +1,6 @@
 DIST qcma-0.4.1.tar.gz 239952 BLAKE2B 342272cc1bab74e34f545ed7c54b7f12732723e55f53224b16a2525bea161f49d4ec799e1e1f868af63067f3021a73389eac581299582a9410aa372e55ea265a SHA512 d061c43528dcb5b361f5e3f7cb303926df29f86f22603a9bc25326c1056344478dae6335d5f82d3f2e56ce98154cb5b1b3e94a3ab1128d7c79d42f8bf92fc7ec
 DIST qcma-0.4.2_pre20181227.tar.gz 244336 BLAKE2B 5a7a33384d4c73050954901e8e8f31ac72d4a2e1ae285389197eedcafe2c9f5d035588bbd330ba72c20048bd889b483259ab5824ad1ba7bdee7351b848ab2e12 SHA512 3379b5b804c169f3dcc1bd3079cffbaa016248631e69563d3e509dcc4de198f259edc5a69bcea4f65cfa16c366d1a2919bdf7aa6703b6648a6f218e9d58f806c
-EBUILD qcma-0.4.1.ebuild 942 BLAKE2B 46dbbaad37e7213b9f1be161318df1a33fd1db83161cc080c4f020410e0edb67465b22e27a31ee8dc85a5c7597f453903329df9a0cc64376d08327624c83fb3b SHA512 5ddcc125f584614ec7d4cfbc67d932ab9e2bc212e30c46f7c9980e7ea6d9e9dfc9c2bba5b0fb447a897b56755aa9dcf1c37dcf5a5bcac71199120650403956a5
-EBUILD qcma-0.4.2_pre20181227.ebuild 1017 BLAKE2B eb3dd5f777c425365ed2053dae32f59fa8f0605787aea99b10e52c86c98f68cdc9e2501d320cf03b3b2cdba0d514371f25f4c8de0f7eeb6035e78f05e3ea907f SHA512 0616dc4d6e2d4717e5de542f00069ba28be193dc56f76dbfbe799ae000dfa3c0b38727c79e5bd9d7017d361dca938c3a1c46039147914091891775fcc2a594cc
-EBUILD qcma-9999.ebuild 888 BLAKE2B 60914b30ecf6a12d8723795e2fb21bf4f137f639eed8d599d4e44134ee9b244297344db623575040158cd92669ab29d8b56c99758ccec433427f3e1cd94737b1 SHA512 b55b80ca481d111a11b4721a24441256b8c8725084e20178598a37f99984f880e19374f6c7cc1c5fe07fabf65ca074603a8af6ea23d76884924f450f2e1f2e46
+EBUILD qcma-0.4.1-r2.ebuild 1322 BLAKE2B e0eca553836b23136cd6bdbdd561fcb8dcbd9619a51558b0694da4bb1a979133bae8d56fc1a4ad010b82cda916722069ce27b85fbf1f175c0616cf5b80f61442 SHA512 286d7874a5b68b6945b2c184a187c09a16962d68e895d0669c9139fc6a006114946febe59410dfc2a598f679b15cfbba7a26bcaf1c6ee724dd180623512eddc3
+EBUILD qcma-0.4.2_pre20181227-r2.ebuild 1397 BLAKE2B 4ec5b620756b2e98b7ef9f68fc6b0216a2cb9c35789852afefff39946d8a88155dabc867be084a070312b5ed5bb091914e322489f2185c1bc05cd9aed6c1b3ca SHA512 de590429cc281208561aa95e64a30c8ad8df2e7035afd2edab8b068d59f7fd9b23fad33b2ad062baa7c7fd1e994863b77048ce7f2f88445c056d76112081ddf8
+EBUILD qcma-9999.ebuild 1268 BLAKE2B aab086c46036a2ec77c384ca871e989bcc6434eb0200ed3e28ba4273380b21654c367bc1eeebeb393a0063e7b75d83edcbe31c18769ab12c9e619e00968aaa18 SHA512 93951cec18b511cc0f18379cd55d03c7528a7e549b58f398f1e5a0b696ca0bba3c5ec52e88196793f06dd7fd03f2f4b7c0100d61a9c53d9b90b4032f741fb873
 MISC metadata.xml 334 BLAKE2B 0618d573d0000cc0aaad937504d506dbff0a774fbf43760d92fe987e1872792b35559cf61eba5b5b72ed910c1551290144c7090938e0ec937df8d3b0fdb6f88a SHA512 8a716e5fbb4c9dcd7185a92c37024654fb9ba9ee2c0afca36878c7dd39dd6eba539c8324cfcd963424c369618a959e0156f4db1a6cba34c06b4cb664bcde816f
diff --git a/app-misc/qcma/qcma-0.4.1.ebuild b/app-misc/qcma/qcma-0.4.1-r2.ebuild
index 865bbcb3f107..011ad13717ee 100644
--- a/app-misc/qcma/qcma-0.4.1.ebuild
+++ b/app-misc/qcma/qcma-0.4.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils
 
@@ -22,20 +22,32 @@ DEPEND="
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	media-libs/vitamtp:0
-	ffmpeg? ( media-video/ffmpeg:0 )
+	ffmpeg? ( media-video/ffmpeg:= )
 	x11-libs/libnotify:0
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	dev-qt/linguist-tools
+	dev-qt/linguist-tools:5
 "
 
 src_prepare() {
+	# http://ffmpeg.org/pipermail/ffmpeg-devel/2018-February/225051.html
+	sed -r \
+		-e '/av_register_all/d' \
+		-i "${S}"/common/avdecoder.h || die "Failed to fix ffmpeg stuff"
 	rm ChangeLog || die "Failed to rm changelog" # Triggers QA warn (symlink to nowhere)
 	default
 }
 
 src_configure() {
-	lrelease common/resources/translations/*.ts
-	eqmake5 PREFIX="${D}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+	$(qt5_get_bindir)/lrelease common/resources/translations/*.ts || die
+	eqmake5 PREFIX="${EPREFIX}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+	einstalldocs
+
+	insinto /usr/share/${PN}/translations
+	doins common/resources/translations/${PN}_*.qm
 }
diff --git a/app-misc/qcma/qcma-0.4.2_pre20181227.ebuild b/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild
index 2e59784ff9cf..d294019b2044 100644
--- a/app-misc/qcma/qcma-0.4.2_pre20181227.ebuild
+++ b/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils vcs-snapshot
 
@@ -24,20 +24,32 @@ DEPEND="
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	media-libs/vitamtp:0
-	ffmpeg? ( media-video/ffmpeg:0 )
+	ffmpeg? ( media-video/ffmpeg:= )
 	x11-libs/libnotify:0
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	dev-qt/linguist-tools
+	dev-qt/linguist-tools:5
 "
 
 src_prepare() {
+	# http://ffmpeg.org/pipermail/ffmpeg-devel/2018-February/225051.html
+	sed -r \
+		-e '/av_register_all/d' \
+		-i "${S}"/common/avdecoder.h || die "Failed to fix ffmpeg stuff"
 	rm ChangeLog || die "Failed to rm changelog" # Triggers QA warn (symlink to nowhere)
 	default
 }
 
 src_configure() {
-	lrelease common/resources/translations/*.ts
-	eqmake5 PREFIX="${D}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+	$(qt5_get_bindir)/lrelease common/resources/translations/*.ts || die
+	eqmake5 PREFIX="${EPREFIX}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+	einstalldocs
+
+	insinto /usr/share/${PN}/translations
+	doins common/resources/translations/${PN}_*.qm
 }
diff --git a/app-misc/qcma/qcma-9999.ebuild b/app-misc/qcma/qcma-9999.ebuild
index 7c2734bf0313..7b9f7476760f 100644
--- a/app-misc/qcma/qcma-9999.ebuild
+++ b/app-misc/qcma/qcma-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils git-r3
 
@@ -22,20 +22,32 @@ DEPEND="
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	media-libs/vitamtp:0
-	ffmpeg? ( media-video/ffmpeg:0 )
+	ffmpeg? ( media-video/ffmpeg:= )
 	x11-libs/libnotify:0
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-	dev-qt/linguist-tools
+	dev-qt/linguist-tools:5
 "
 
 src_prepare() {
+	# http://ffmpeg.org/pipermail/ffmpeg-devel/2018-February/225051.html
+	sed -r \
+		-e '/av_register_all/d' \
+		-i "${S}"/common/avdecoder.h || die "Failed to fix ffmpeg stuff"
 	rm ChangeLog || die "Failed to rm changelog" # Triggers QA warn (symlink to nowhere)
 	default
 }
 
 src_configure() {
-	lrelease common/resources/translations/*.ts
-	eqmake5 PREFIX="${D}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+	$(qt5_get_bindir)/lrelease common/resources/translations/*.ts || die
+	eqmake5 PREFIX="${EPREFIX}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+	einstalldocs
+
+	insinto /usr/share/${PN}/translations
+	doins common/resources/translations/${PN}_*.qm
 }