diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-07 21:22:54 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-07 21:22:54 +0000 |
| commit | 1cfea2a84c51291a77ab820b6871efcff10c148d (patch) | |
| tree | 924f8b07cb24ba72b3d889cf4b50bdff4d2785c0 /media-video/vidcutter | |
| parent | 441369caa3d11703d0349d4b9746b7ad10aa6cb2 (diff) | |
gentoo auto-resync : 07:11:2022 - 21:22:53
Diffstat (limited to 'media-video/vidcutter')
| -rw-r--r-- | media-video/vidcutter/Manifest | 5 | ||||
| -rw-r--r-- | media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild (renamed from media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild) | 18 | ||||
| -rw-r--r-- | media-video/vidcutter/vidcutter-9999.ebuild | 8 |
3 files changed, 22 insertions, 9 deletions
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest index 5aa1743f4214..8dbaac4446cd 100644 --- a/media-video/vidcutter/Manifest +++ b/media-video/vidcutter/Manifest @@ -1,4 +1,5 @@ +DIST vidcutter-6.0.5.1-libmpv-api2.patch 2327139 BLAKE2B c2665e2c501a19db86a25145da39e6990843fb11a7bdf3170ec7e268e23a23abb21cd8d4b459a4c862ffc27756106d81e7d9b5d58bf3417fd787c03528eba770 SHA512 063908bf939c03952d623cc0ae7ea301d4605660a548e3088f6c901f3d98cf13a5e49180414c8a1c05931d9c4ca2a251858951676632768ff30954a6df7a4e4a DIST vidcutter-6.0.5.1.tar.gz 9909274 BLAKE2B 063c20f6ae0565b0f3a160b5ee298aae05b2ee1876cd4c73d9f37578a9e86a872353c3e2b7b1b6302db3d5a876139bfb19d50bf7cb4dd18e6e1d1a1ca3587fbd SHA512 f2ea2a86d9eaa3c6593e785daad6869c151baa1add529c9edaf2282f7acad762fbb29804790aece5e4fcd89e9e9bc77f61d1f0b68a1b1f3ecf58951ee8f200e9 -EBUILD vidcutter-6.0.5.1-r1.ebuild 1015 BLAKE2B 0641285f5b5664b13f674a150c13f6de3b5f9f70ddc54acd2d33047744de6bf23086ded1ef518d754196bc50901a362c20a44540fc22697ae82d88afda966fad SHA512 06bc78a0fce27b6723a3b7008ce1fd6fec03bf6f9f926a48937453c2eac16b39a97ca426459e7347c368f01d43ec4794911fa87332dee1ca1a05229635889b30 -EBUILD vidcutter-9999.ebuild 1017 BLAKE2B 39221734a676128dd3e2f7d11e202d9c64108d7d3e47d93c3dd695787d5168a247211d2c92dba369fe7e6c3e87072a157c4d0421123b54042ab6af307d734cd9 SHA512 06d0fdbd049767fd39eb1f6f203a5bc75e2cdecab9bebf18c813237f54891181bb3cd3235481d25fcec5b23eebef5bb7562d1726f42996f6431577d2c2b18ea0 +EBUILD vidcutter-6.0.5.1-r2.ebuild 1466 BLAKE2B 8fe4eadf3972ef62828e5d38e1abfd1897dda6153b11f1ba372dabee574723a250b7792298b4e1f833eed72e9f64cc1c19d225d5e3eff39b02f23b5418d6e26b SHA512 6ab60812cfe8424202f80538395813bdc4b387f0ee37c68f5b45034e2efa364a9ffc9fad55a9d5106b107dbaabfc31c0c2e89c1020761c2f0678169c5fe9714d +EBUILD vidcutter-9999.ebuild 1007 BLAKE2B 8fe9d8317bb53da52747563e97ef61142c2cc933c65c4fa2b411437e9f4c899ac7ec5530650492a4cc3d5c57d37bbcf628cbf4686a435d62099f334fbce1673c SHA512 76d199b9621c95027e7c9eefdb22f0deadb4ef86789866be023db0921a1641ddcba35dffb28181ea84ac72c548445a00848b663d18d594e480c05d9a530de030 MISC metadata.xml 461 BLAKE2B 0eeb6abbb7914b27cd567263de9001cfe17c9bd3b98a0887b21fd76b908a48c0abb3695039d21803709d47483078d15c5d412be7c408640ece0a433806272640 SHA512 55fd2db2f66d5cbc2410dfc57f235b90554cf3de4aaa88fc5069d499590ec45264499881f049c5469771f063638a65adad89686717c28abb89ef6ea632c88a30 diff --git a/media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild b/media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild index a94a18c5e7bf..87cdb433df76 100644 --- a/media-video/vidcutter/vidcutter-6.0.5.1-r1.ebuild +++ b/media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 xdg @@ -15,6 +15,7 @@ if [[ ${PV} == 9999 ]];then EGIT_REPO_URI="https://github.com/ozmartian/vidcutter" else SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" https://github.com/ozmartian/${PN}/commit/1d88825feb5a73a50d019914ba9d0008562a58ce.patch -> ${P}-libmpv-api2.patch" KEYWORDS="amd64 x86" fi @@ -23,7 +24,7 @@ SLOT="0" IUSE="" DEPEND=" - >=media-video/mpv-0.25[libmpv] + >=media-video/mpv-0.25:=[libmpv] " RDEPEND="${DEPEND} >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] @@ -35,7 +36,18 @@ BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}]" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +src_prepare() { + # needed for mpv:0/2 but breaks stable mpv:0/0, do conditional patching + # for now (we can do has_version given the := binding operator) + # https://github.com/ozmartian/vidcutter/issues/345 + if has_version -d 'media-video/mpv:0/2'; then + eapply "${DISTDIR}"/${P}-libmpv-api2.patch + fi + + distutils-r1_src_prepare +} + src_install() { distutils-r1_src_install - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" + mv "${ED}"/usr/share/doc/{${PN},${PF}} || die } diff --git a/media-video/vidcutter/vidcutter-9999.ebuild b/media-video/vidcutter/vidcutter-9999.ebuild index 383061cd1bcc..cb619436f0cf 100644 --- a/media-video/vidcutter/vidcutter-9999.ebuild +++ b/media-video/vidcutter/vidcutter-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 xdg @@ -23,7 +23,7 @@ SLOT="0" IUSE="" DEPEND=" - >=media-video/mpv-0.25[libmpv] + >=media-video/mpv-0.25:=[libmpv] " RDEPEND="${DEPEND} >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] @@ -37,5 +37,5 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_install() { distutils-r1_src_install - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" + mv "${ED}"/usr/share/doc/{${PN},${PF}} || die } |