gentoo resync : 30.09.2020

7 files changed, 49 insertions, 17 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 7607c0cea7fe..c337ec757187 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index b44c564d0c99..f243e4e52596 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,5 +1,5 @@
 AUX ffmpeg2theora-0.29-swr.patch 778 BLAKE2B e0b57be8a1941abc1c3c2c01939dc339a705c9cc7ce1a0de81a868023dc6d9bb7593ae3b7c10cae9ad9e3418819637a2f9e20c42409047f5b9d5686864eacf15 SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73
-AUX ffmpeg2theora-0.29-underlinking.patch 503 BLAKE2B 2d6d4fb7c23a2fc439b519348a2b39ea30ab00c5a12f5c37f2ae8965d42af5baa4465172e163cd66a63810b3c13923068d8debad495197ec1bc7d469710dbdc5 SHA512 a9c16e115d72400cd29c60e9893b89e37a1c4800edebc23ebd576c47b49c37ec69e31fe2de4bef50a32c1f60a1be5df5dae2b62000e8f558b30c440938652632
+AUX ffmpeg2theora-0.29-underlinking.patch 507 BLAKE2B 337a94a9a948d375a4930686951d1b0db4c8e8bf97c63c2e46729b721e9c0b11e7c5dae648826b5afda0b35e22f8cc4e876513a74831d61c436bcb3937719d51 SHA512 44be5be61ab9786446d49498cf0496b9600b65ecba9b1199f98ee9030f5224887f6a1de73eaab1ee04cefa391ffcfd8629eb4cb9d3e28216569b570cc1e96e48
 DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1
-EBUILD ffmpeg2theora-0.30.ebuild 1023 BLAKE2B 6315347ccdf5cbed4c800a8f8bf12171cd386150bc9d2f193e106cf110982f299af03ef81670a77d00068d560629d6b225bdf2ad72f4893c4e74ee08411c236b SHA512 e1714a54d6d9309bbee045459dccec01fceb9ffca413de14021f8aca6487dd3de8ae08fd9fdf5676ad4cb16d5793126caca717fc45574b2c4ca56df76ce03478
+EBUILD ffmpeg2theora-0.30-r1.ebuild 1156 BLAKE2B 13eb425d21e1f029a32989a9c0b2565993891517564ae82ccbf3689573c98260aeb6d24790646dc9d03e9a0327a884e54d1384d07fe51caa13f809b48a9e37a3 SHA512 d879272ac2899f5d50689a7642da9989e07dfc8f4c13b500e2dc3e18128de48d0317c55e3ef00b86f4a2b28b4a0a05e755a66e1521a2ab7bcc18a01f9dff6173
 MISC metadata.xml 314 BLAKE2B d200d644a8e139816ef36f882f1adf6025a292cfcc6fbfc820265b84a8fc564ad427b0815fb30024ca3d90cf7f42738896cee49e92fc5f8a1e55566051015220 SHA512 2cc51e06842a129ba5e490939f29861b36a1919086aae97a1f5639b56b211700b3839ac66898d0e14b25a3b1471869266ccbff47d2fd98a0baae429514466f54
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
index 49c6e4674e0a..0e9cd2e06d01 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs scons-utils
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="A simple converter to create Ogg Theora files"
 HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
@@ -19,30 +21,35 @@ RDEPEND="
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.1[encode]
 	kate? ( >=media-libs/libkate-0.3.7 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.29-swr.patch
+	"${FILESDIR}"/${PN}-0.29-underlinking.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.29-swr.patch \
-		"${FILESDIR}"/${PN}-0.29-underlinking.patch
+	default
+	2to3 -n -w --no-diffs SConstruct || die
 }
 
 src_configure() {
-	myesconsargs=(
+	SCONSARGS=(
 		APPEND_CCFLAGS="${CFLAGS}"
 		APPEND_LINKFLAGS="${LDFLAGS}"
 		prefix=/usr
 		mandir=PREFIX/share/man
 		libkate=$(usex kate 1 0)
-		)
+	)
 }
 
 src_compile() {
-	escons
+	escons "${SCONSARGS[@]}"
 }
 
 src_install() {
-	escons destdir="${D}" install
+	escons "${SCONSARGS[@]}" destdir="${D}" install
 	dodoc AUTHORS ChangeLog README subtitles.txt TODO
 }
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
index dc877603913a..791e39d87744 100644
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
+++ b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
@@ -6,8 +6,8 @@ v = pow(v, g) * 255.0;    // mplayer's vf_eq2.c multiplies with 256 here, strang
 
 For build failure and log, see Gentoo bug #504698
 
---- SConstruct
-+++ SConstruct
+--- a/SConstruct
++++ b/SConstruct
 @@ -206,9 +206,8 @@
    if env['crossmingw']:
        env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 0b621c7f0d75..a41e5af83190 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,4 +1,5 @@
 AUX subtitlecomposer-0.7.0-tests-optional.patch 242 BLAKE2B 6a3d88a537ad39a151b8a6ac071376eda0d1e5d504e92052b9f55e4693633b47fc2b6986d560bd086adf76630ad24bc3671b88f3bc97f9cb429a9e14ad9376bc SHA512 65f5c8db0c5e99b51600db772c918acb7154c7999bbbbbed18ed859f4defcb70d4f907c02a08d9a7529f3aaf4867d6154b9987fb3528cb100f4daa4466e33e74
+AUX subtitlecomposer-0.7.0-valid-desktop-file.patch 1090 BLAKE2B 4491d0bf738fe19374d40b2d278322694a456ac2d11394853653f44351ddf06714143164773eb6597ba4b6f55cf510803231c1241cca20cdc9822d3892f8e646 SHA512 4f2802be511da0b9f132d4368e23c06510fd0c115c8a19f5c05d0e737c355b3c061d290e38370a5992b85a48d77b23949ce3ebf675b9086d585df5be056e358b
 DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
-EBUILD subtitlecomposer-0.7.0.ebuild 1907 BLAKE2B 321c225b3ec067ddeaa16e69ba076fde1a23e8c2f0fb4708f2b171f97bb1e91a6e0913e8b2599899bfca5939de2259b8b4fde274d16afd34c6d5dce3f0d98a24 SHA512 665e46d1246f8cc680926fdfb86d7f7e634e324ea333f4bef45fc16f243bd1bb3ce483bc0e15325e744461f1e272e838bfa831aab1a5b2f58f9b143377ff6832
+EBUILD subtitlecomposer-0.7.0.ebuild 1957 BLAKE2B c198a52aab4776e0b17e109366db581339744e5727078cfffac79023032eb36ffe9a05fe0c93ed906d211281f86fea3112a28ce06abb7f0ee7f588b3fa9d10b7 SHA512 7eab20abe42eadd951982890349d1964609cd4092b2b00dad2a07e332e39508877067eaf839d65249647d294e487837d5377fe4ff25532af3132b3636e9467dc
 MISC metadata.xml 524 BLAKE2B 662474bada941eadcab48ae4432e72af4f786ff61d2bc1db20115e2f70ca4953e01c38fd550cce72908fe5c36077d9e1b240f53e24142c7556802f3a7783d1bd SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
new file mode 100644
index 000000000000..932fc6770f04
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
@@ -0,0 +1,21 @@
+From ce2a1a94a6a0802d9a289d701e76b7975d5baa0d Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Thu, 9 Apr 2020 12:21:07 +0200
+Subject: [PATCH] Removed invalid subpicture/x-pgs mime - refs #20
+
+---
+ src/subtitlecomposer.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/subtitlecomposer.desktop b/src/subtitlecomposer.desktop
+index 4195b076..af8a80af 100644
+--- a/src/subtitlecomposer.desktop
++++ b/src/subtitlecomposer.desktop
+@@ -14,6 +14,6 @@
+ Comment[hr]=KDE uređivač podnaslova
+ Icon=subtitlecomposer
+ Exec=subtitlecomposer %f
+-MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;application/x-vobsub;subpicture/x-pgs;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
++MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
+ Terminal=false
+ Categories=Qt;KDE;AudioVideo;
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index f61bf8ca94d2..d5fe989dd52a 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm
 
 DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
+HOMEPAGE="https://subtitlecomposer.kde.org/"
 SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -54,7 +54,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-tests-optional.patch"
+	"${FILESDIR}/${P}-valid-desktop-file.patch" # bug 745429
+)
 
 S="${WORKDIR}/SubtitleComposer-${PV}"