gentoo resync : 15.12.2019

6 files changed, 2 insertions, 247 deletions

diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index d1cef19ed243..82d8abb0eaf8 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,10 +1,4 @@
-AUX pitivi-0.97.1-optional-tests.patch 677 BLAKE2B b0f75f33948cdacb2b73678bc580d3f7ee8ae224e008b7d92629b0a7b7e6991a98cb09696748240c7314719559baf20d2eec4a9eead09571a57dfc06302a2418 SHA512 a56b8e67410301e83a5559481ded4c50fcc81b8ba148c936623d36e59c9a8db3b6215adfb25f48e75edc821b4d8befdb023da0c15dc8b998531bc7551946c5bd
-AUX pitivi-0.98.1-optional-tests.patch 742 BLAKE2B c85f9002504f9314ae4a251d3ecbb8c2e4e70cb217e9328465015f2c3e06436d50a327c91cd5b686a2a765ceb46ec7fc0dfab998bfa96d985cf4855a4cd14919 SHA512 fce5ae7ac4fdd4c340b233529564e20da1dd965261cc2c79d3368ef83ac23931cdee6b492e59a628beaaa25362b81a604ec5bd7bb6270bdb72c15dabb83feac2
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
-DIST pitivi-0.97.1.tar.xz 5096672 BLAKE2B 010b7ef80e0b57f83fe4e7d201a2839f65e2c8b62019d4271cd0d6d49edb44a5083024abdf13e735f94d7e681a77ef45e1d876cf6e5c20e6cc1b1876da5b3a99 SHA512 be5fcf5148349f685f0ee23a82b36d90fe0b7ff6d1d8cdcaf73272b8e5c29ddfe1d6c21353eb95f2d786fe4922a93c747403e5e27141d815f5b46f846a1d95ba
-DIST pitivi-0.98.1.tar.xz 5112280 BLAKE2B 9269163a5c964a6a2b3fd094262594a38bfff4dd052ea0f3673f2ac195f197eb9b888de673e62f884137d056fba2b853d11cf7300e2f81d71c6e49402350cc40 SHA512 b6530b1b5429c4379699d7492c31ec60ddc514c94a003fe240f7e390b6349093d2f4f72abb1edb4253bd938620c73dfb361abf21915d36ff3b75332e8612bcb3
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
-EBUILD pitivi-0.97.1.ebuild 2561 BLAKE2B 93cbd94d740b8d86f650ba7ad041447f3d02093f9c1810fcdfd1bbcf36babed0c7b2ef34d4c1b184fa4c1f226c9f63222b0f684b913e065b78a50341a652d5b7 SHA512 e339a213b259220c09a932acb10916f2c4b2d98fa0f144a0e8b27cdef03bf2b08103cb9effff3ca9fe406e1ae207b7acf2dab1f3f2ee02162a812c0666548e4c
-EBUILD pitivi-0.98.1.ebuild 2282 BLAKE2B f6501afd2a01753d9d74e08f4a49cb546950a56e4628d0f743ea44b287c5eec3e05013fd502df453c82af0bedc71ec6685dec33324f6816939a96ef7ade8931d SHA512 5eb9f95c6eacfa74cfc7b7ab2eafef092cbcd0644cd0708df6d60a162f32bc15043bead287d999be89b89539bb8f6329a41828686c573bf9b79455a77b4efc4f
-EBUILD pitivi-0.999.ebuild 2338 BLAKE2B 52dbbdad2af5e945f2201c5f95ac045c3cd5774839dc89ece93dd95c5ab9a3f97ffccf8c4a737f28ea9ca78b79556d24f80a638f3a8d70465047a5598358323f SHA512 7ea0a7cd804064820266c1e8d2bfbc91b08542d3bd1d37078d96c4196d9fa46f6e7cb5493e6c98feb957358d95bfad95ad742af1edac892e2d4c3b415c240713
+EBUILD pitivi-0.999.ebuild 2365 BLAKE2B 81eb8da38e0c2632ee68056c065476b02f59104763a9d77b7ffd76dcc026f72146d37de6c32d83207015a6dfa857a91c5c170a7bde88817f3ed01d690e06a397 SHA512 d5b8a9ba87abf770f90edf146a378cb257e81f9c4f05b2cb8237fc76604249e43a10f1de92ae70136274038c150646c48df1e09ba88dc9c00a638ceb6c622f3d
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch b/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch
deleted file mode 100644
index cfc86dccb1d6..000000000000
--- a/media-video/pitivi/files/pitivi-0.97.1-optional-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-make tests optional
-
---- a/meson_options.txt	2016-09-19 23:35:54.944511834 +0200
-+++ b/meson_options.txt	2016-09-19 23:36:10.693485976 +0200
-@@ -1,2 +1,3 @@
- option('enable-xunit', type : 'boolean', value : false)
- option('disable-help', type : 'boolean', value : false)
-+option('enable-tests', type : 'boolean', value : false)
---- a/meson.build	2016-09-19 23:35:06.694590798 +0200
-+++ b/meson.build	2016-09-19 23:35:45.092527990 +0200
-@@ -57,7 +57,9 @@
- if not get_option('disable-help')
-     subdir('help')
- endif
--subdir('tests')
-+if get_option('enable-tests')
-+    subdir('tests')
-+endif
- 
- archiver = find_program('git-archive-all', required : false)
- if archiver.found()
diff --git a/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch b/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch
deleted file mode 100644
index e5f55ffe765f..000000000000
--- a/media-video/pitivi/files/pitivi-0.98.1-optional-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Make tests optional
-
---- a/meson_options.txt	2016-09-19 23:35:54.944511834 +0200
-+++ b/meson_options.txt	2016-09-19 23:36:10.693485976 +0200
-@@ -1,2 +1,3 @@
- option('enable-xunit', type : 'boolean', value : false)
- option('disable-help', type : 'boolean', value : false)
-+option('enable-tests', type : 'boolean', value : false)
---- a/meson.build	2017-09-03 22:52:39.681974053 +0200
-+++ b/meson.build	2017-09-03 22:53:29.934556188 +0200
-@@ -71,8 +71,10 @@
- if not get_option('disable-help')
-     subdir('help')
- endif
--subdir('tests')
--subdir('tests/validate-tests')
-+if get_option('enable-tests')
-+  subdir('tests')
-+  subdir('tests/validate-tests')
-+endif
- 
- archiver = find_program('git-archive-all', required : false)
- if archiver.found()
diff --git a/media-video/pitivi/pitivi-0.97.1.ebuild b/media-video/pitivi/pitivi-0.97.1.ebuild
deleted file mode 100644
index 087bc0875c1d..000000000000
--- a/media-video/pitivi/pitivi-0.97.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="v4l test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# XXX: recommends gst-plugins-libav and frei0r-plugins
-
-# Do not forget to check pitivi/check.py for dependencies!!!
-# pycanberra, gnome-desktop, libav, libnotify and liwnck are optional
-GST_VER="1.8.2"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
-	>=x11-libs/cairo-1.10
-
-	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
-	>=media-plugins/gst-transcoder-1.8.2-r1
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.30.0:2
-
-	>=dev-libs/gobject-introspection-1.34:=
-	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/pycanberra[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-
-	gnome-base/librsvg:=
-	gnome-base/gnome-desktop:3=[introspection]
-
-	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
-	>=media-libs/gst-plugins-good-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
-
-	x11-libs/libnotify[introspection]
-	x11-libs/libwnck:3[introspection]
-	>=x11-libs/gtk+-3.20.0:3[introspection]
-
-	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-python/setuptools
-	>=dev-util/intltool-0.35.5
-	>=dev-util/meson-0.28.0
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	# Make tests optional, bug #594096
-	"${FILESDIR}"/${P}-optional-tests.patch
-)
-
-src_configure() {
-	# Not a normal configure
-	# --buildtype=plain needed for honoring CFLAGS/CXXFLAGS and not
-	# defaulting to debug
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--buildtype=plain \
-		--libdir="$(get_libdir)" \
-		-Denable-tests=$(usex test true false) \
-		|| die
-}
-
-src_compile() {
-	# We cannot use 'make' as it won't allow us to build verbosely
-	cd mesonbuild && ninja -v
-}
-
-src_test() {
-	export PITIVI_TOP_LEVEL_DIR="${S}"
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/media-video/pitivi/pitivi-0.98.1.ebuild b/media-video/pitivi/pitivi-0.98.1.ebuild
deleted file mode 100644
index 928c451ff8bd..000000000000
--- a/media-video/pitivi/pitivi-0.98.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome.org meson python-single-r1 virtualx
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="v4l test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# XXX: recommends gst-plugins-libav and frei0r-plugins
-
-# Do not forget to check pitivi/check.py for dependencies!!!
-# pycanberra, libav, libnotify and liwnck are optional
-GST_VER="1.10.2"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
-	>=x11-libs/cairo-1.10
-
-	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
-	>=media-plugins/gst-transcoder-1.8.2-r1
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.30.0:2
-
-	>=dev-libs/gobject-introspection-1.34:=
-	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/pycanberra[${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]
-	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
-	>=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[introspection]
-	x11-libs/libwnck:3[introspection]
-	>=x11-libs/gtk+-3.20.0:3[introspection]
-
-	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-python/setuptools
-	>=dev-util/intltool-0.35.5
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-python/nose2[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	# Make tests optional, bug #594096
-	"${FILESDIR}"/${P}-optional-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Denable-tests=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-}
-
-src_test() {
-	export PITIVI_TOP_LEVEL_DIR="${S}"
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/media-video/pitivi/pitivi-0.999.ebuild b/media-video/pitivi/pitivi-0.999.ebuild
index 0f1661aa8e0b..c7703da70ced 100644
--- a/media-video/pitivi/pitivi-0.999.ebuild
+++ b/media-video/pitivi/pitivi-0.999.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 IUSE="v4l test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # XXX: recommends gst-plugins-libav and frei0r-plugins