From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B222C158094 for ; Mon, 10 Oct 2022 02:34:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA59CE08EB; Mon, 10 Oct 2022 02:34:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91F48E08ED for ; Mon, 10 Oct 2022 02:34:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D3C5B341118 for ; Mon, 10 Oct 2022 02:34:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41EA1613 for ; Mon, 10 Oct 2022 02:34:42 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1665369252.9c679200f60260832a48fcd725c48354465de180.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pitivi/, media-video/pitivi/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pitivi/Manifest media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch media-video/pitivi/pitivi-2021.05-r1.ebuild X-VCS-Directories: media-video/pitivi/ media-video/pitivi/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9c679200f60260832a48fcd725c48354465de180 X-VCS-Branch: master Date: Mon, 10 Oct 2022 02:34:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2897d158-6e2e-4759-ad70-e97336c94069 X-Archives-Hash: 7293c4e615a8fa74f6ae2404285784f6 commit: 9c679200f60260832a48fcd725c48354465de180 Author: Matt Turner gentoo org> AuthorDate: Sun Oct 9 23:48:37 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Oct 10 02:34:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c679200 media-video/pitivi: Drop old versions Signed-off-by: Matt Turner gentoo.org> media-video/pitivi/Manifest | 1 - .../files/pitivi-2021.05-meson-compatibility.patch | 45 ----------- media-video/pitivi/pitivi-2021.05-r1.ebuild | 91 ---------------------- 3 files changed, 137 deletions(-) diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest index c68de366d021..5bba247d761b 100644 --- a/media-video/pitivi/Manifest +++ b/media-video/pitivi/Manifest @@ -1,2 +1 @@ -DIST pitivi-2021.05.tar.xz 11303884 BLAKE2B f87f16cc1ab7ea0f97bc92cdd9f1d5993051ed67b26473748aeb327a4cb51bb32510c845e1665ec3eb3b67c3f0f113c05a514076bad4e13d0fadbd725bcb6bb6 SHA512 3ecb571d501b634ca3a369d4020954cc0b2bc101ceb12bee74d6b38c9ca8f2bf15fe94030421c43503870128d8218548feca7d32cf25b4afcf610365784ca9bb DIST pitivi-2022.06.tar.xz 11352412 BLAKE2B f7d14f9bff136a8b50c0ce82e66fad92ba7df429d8cf588c526ae04f673617d882a0cc024c5a21c97471d2b31cb0001cefdeb8e32c9f62e1c6600d9500d1e428 SHA512 649c8e61d9545cbf35a0a0c8f648490c14c8bfb6c6637794887c03bffd6998c63cb2cc22102cd2f7a59974f79488a13f29beceadab29ddd1c1c01abff33a85fa diff --git a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch deleted file mode 100644 index 990f84b06795..000000000000 --- a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ddf2369d1fc6fddd63f676cc905a8b8e96291a4c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Tue, 25 Jan 2022 15:37:34 +0200 -Subject: [PATCH] Fix compatibility with meson 0.61 - -Previously positional arguments to i18n.merge_files() were just ignored -but this became an error. ---- - data/meson.build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 2ea82cf12..60d23169b 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -6,7 +6,7 @@ install_subdir('audiopresets', install_dir: pkgdatadir) - install_subdir('videopresets', install_dir: pkgdatadir) - install_subdir('gstpresets', install_dir: pkgdatadir) - --desktop_file = i18n.merge_file('org.pitivi.Pitivi.desktop', -+desktop_file = i18n.merge_file( - type: 'desktop', - output : 'org.pitivi.Pitivi.desktop', - input : 'org.pitivi.Pitivi.desktop.in', -@@ -25,7 +25,7 @@ if desktop_file_validate.found() - ) - endif - --appdata_file = i18n.merge_file('org.pitivi.Pitivi.appdata.xml', -+appdata_file = i18n.merge_file( - type: 'xml', - output : 'org.pitivi.Pitivi.appdata.xml', - input : 'org.pitivi.Pitivi.appdata.xml.in', -@@ -43,7 +43,7 @@ if appstream_util.found() - ) - endif - --i18n.merge_file('org.pitivi.Pitivi-mime.xml', -+i18n.merge_file( - output : 'org.pitivi.Pitivi-mime.xml', - input : 'org.pitivi.Pitivi-mime.xml.in', - po_dir: podir, --- -GitLab - diff --git a/media-video/pitivi/pitivi-2021.05-r1.ebuild b/media-video/pitivi/pitivi-2021.05-r1.ebuild deleted file mode 100644 index 92d0aad1b722..000000000000 --- a/media-video/pitivi/pitivi-2021.05-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="sqlite" - -inherit gnome.org meson python-single-r1 xdg - -DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework" -HOMEPAGE="https://www.pitivi.org" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Do not forget to check pitivi/check.py for dependencies!!! -# gsound, libav, libnotify and v4l are optional -GST_VER="1.18.4" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pycairo-1.10[${PYTHON_USEDEP}] - ') - >=x11-libs/cairo-1.10 - - >=media-libs/gstreamer-${GST_VER}:1.0[introspection] -" -RDEPEND="${COMMON_DEPEND} - >=dev-libs/glib-2.30.0:2 - - >=dev-libs/gobject-introspection-1.34:= - - dev-libs/libpeas[${PYTHON_SINGLE_USEDEP}] - - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - >=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] - ') - - gnome-base/librsvg:= - - >=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection] - >=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection,theora] - >=media-libs/gst-plugins-bad-${GST_VER}:1.0 - >=media-plugins/gst-plugins-gtk-${GST_VER}:1.0 - >=media-libs/gst-plugins-good-${GST_VER}:1.0 - >=media-plugins/gst-plugins-libav-${GST_VER}:1.0 - >=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0 - - >=x11-libs/libnotify-0.7[introspection] - x11-libs/libwnck:3[introspection] - >=x11-libs/gtk+-3.20.0:3[introspection] -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/yelp-tools - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - >=dev-util/intltool-0.35.5 - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - # https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c - "${FILESDIR}"/${P}-meson-compatibility.patch - "${FILESDIR}"/${P}-python-collections.patch -) - -src_configure() { - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - meson_src_install - python_fix_shebang "${D}" -}