From ebd97f5185301f60902cef42029db41cfce53580 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sun, 1 Mar 2020 17:09:31 +0200 Subject: media-video/cheese-3.34: various packaging fixes * Drop IUSE=X, it is NOT optional * Replace wrong intltool dep with gettext * Fix USE=gtk-doc deps * Fix lack of gnome2_schemas_update calls * Use xdg.eclass instead of xdg-utils.eclass (and get missing env reset from that added back) * Re-enable tests, they appear to work fine Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp --- media-video/cheese/cheese-3.34.0-r1.ebuild | 96 +++++++++++++++++++++++++++ media-video/cheese/cheese-3.34.0.ebuild | 103 ----------------------------- 2 files changed, 96 insertions(+), 103 deletions(-) create mode 100644 media-video/cheese/cheese-3.34.0-r1.ebuild delete mode 100644 media-video/cheese/cheese-3.34.0.ebuild (limited to 'media-video') diff --git a/media-video/cheese/cheese-3.34.0-r1.ebuild b/media-video/cheese/cheese-3.34.0-r1.ebuild new file mode 100644 index 000000000000..17d4540d9887 --- /dev/null +++ b/media-video/cheese/cheese-3.34.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson vala virtualx xdg + +DESCRIPTION="A cheesy program to take pictures and videos from your webcam" +HOMEPAGE="https://wiki.gnome.org/Apps/Cheese" + +LICENSE="GPL-2+" +SLOT="0/8" # subslot = libcheese soname version +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="gtk-doc +introspection test" +RESTRICT="!test? ( test )" + +DEPEND=" + >=media-libs/clutter-1.13.2:1.0[introspection?] + media-libs/clutter-gst:3.0 + >=media-libs/clutter-gtk-0.91.8:1.0 + x11-libs/gdk-pixbuf:2[jpeg,introspection?] + >=dev-libs/glib-2.39.90:2 + >=gnome-base/gnome-desktop-2.91.6:3= + >=media-libs/gstreamer-1.4:1.0[introspection?] + >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis] + >=media-libs/gst-plugins-bad-1.4:1.0 + >=x11-libs/gtk+-3.13.4:3 + >=media-libs/libcanberra-0.26[gtk3] + x11-libs/libX11 + sys-apps/dbus + media-video/gnome-video-effects + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) + + media-libs/cogl:1.0=[introspection?] + +" +RDEPEND="${DEPEND} + >=media-libs/gst-plugins-good-1.4:1.0 + + >=media-plugins/gst-plugins-jpeg-1.4:1.0 + >=media-plugins/gst-plugins-v4l2-1.4:1.0 + >=media-plugins/gst-plugins-vpx-1.4:1.0 +" + +BDEPEND=" + gtk-doc? ( dev-util/gtk-doc ) + dev-libs/libxslt + app-text/docbook-xml-dtd:4.3 + dev-util/itstool + dev-libs/appstream-glib + dev-libs/libxml2:2 + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + x11-base/xorg-proto + test? ( x11-libs/libXtst ) + $(vala_depend) +" + +PATCHES=( + "${FILESDIR}"/${P}-buildfix.patch + "${FILESDIR}"/${P}-help-No-more-menu-bars-in-3.34-UI.patch +) + +src_prepare() { + xdg_src_prepare + vala_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + $(meson_use test tests) + -Dman=true + ) + + meson_src_configure + + # Hack: version.xml is not generated if gtk-doc is not enabled + echo ${PV} > docs/reference/version.xml +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-video/cheese/cheese-3.34.0.ebuild b/media-video/cheese/cheese-3.34.0.ebuild deleted file mode 100644 index 5260911df0d1..000000000000 --- a/media-video/cheese/cheese-3.34.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org meson vala virtualx xdg-utils - -DESCRIPTION="A cheesy program to take pictures and videos from your webcam" -HOMEPAGE="https://wiki.gnome.org/Apps/Cheese" - -LICENSE="GPL-2+" -SLOT="0/8" # subslot = libcheese soname version -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="gtk-doc +introspection test X" -RESTRICT="test" # Tests fail - -REQUIRED_USE="test? ( X )" -COMMON_DEPEND=" - >=dev-libs/glib-2.39.90:2 - >=x11-libs/gtk+-3.13.4:3[introspection?] - >=gnome-base/gnome-desktop-2.91.6:3= - >=media-libs/libcanberra-0.26[gtk3] - >=media-libs/clutter-1.13.2:1.0[introspection?] - >=media-libs/clutter-gtk-0.91.8:1.0 - media-libs/clutter-gst:3.0 - media-libs/cogl:1.0=[introspection?] - - media-video/gnome-video-effects - x11-libs/gdk-pixbuf:2[jpeg,introspection?] - - >=media-libs/gstreamer-1.4:1.0[introspection?] - >=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X?] - - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) - - X? ( - x11-base/xorg-proto - x11-libs/libX11 - ) -" - -DEPEND=" - ${COMMON_DEPEND} - test? ( x11-libs/libXtst ) -" - -RDEPEND="${COMMON_DEPEND} - >=media-libs/gst-plugins-bad-1.4:1.0 - >=media-libs/gst-plugins-good-1.4:1.0 - - >=media-plugins/gst-plugins-jpeg-1.4:1.0 - >=media-plugins/gst-plugins-v4l2-1.4:1.0 - >=media-plugins/gst-plugins-vpx-1.4:1.0 -" - -BDEPEND=" - $(vala_depend) - app-text/docbook-xml-dtd:4.3 - dev-util/itstool - dev-libs/appstream-glib - >=dev-util/intltool-0.50 - dev-libs/libxslt - dev-libs/libxml2:2 - dev-util/glib-utils - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-buildfix.patch - "${FILESDIR}"/${P}-help-No-more-menu-bars-in-3.34-UI.patch -) - -src_prepare() { - vala_src_prepare - - default -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - $(meson_use test tests) - -Dman=true - ) - - meson_src_configure - - # Hack: version.xml is not generated if gtk-doc is not enabled - echo ${PV} > docs/reference/version.xml -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} -- cgit v1.2.3-65-gdbad