1 |
commit: ebd97f5185301f60902cef42029db41cfce53580 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 15:09:31 2020 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 16:17:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd97f51 |
7 |
|
8 |
media-video/cheese-3.34: various packaging fixes |
9 |
|
10 |
* Drop IUSE=X, it is NOT optional |
11 |
* Replace wrong intltool dep with gettext |
12 |
* Fix USE=gtk-doc deps |
13 |
* Fix lack of gnome2_schemas_update calls |
14 |
* Use xdg.eclass instead of xdg-utils.eclass (and get missing env reset |
15 |
from that added back) |
16 |
* Re-enable tests, they appear to work fine |
17 |
|
18 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
19 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
20 |
|
21 |
...heese-3.34.0.ebuild => cheese-3.34.0-r1.ebuild} | 63 ++++++++++------------ |
22 |
1 file changed, 28 insertions(+), 35 deletions(-) |
23 |
|
24 |
diff --git a/media-video/cheese/cheese-3.34.0.ebuild b/media-video/cheese/cheese-3.34.0-r1.ebuild |
25 |
similarity index 76% |
26 |
rename from media-video/cheese/cheese-3.34.0.ebuild |
27 |
rename to media-video/cheese/cheese-3.34.0-r1.ebuild |
28 |
index 5260911df0d..17d4540d988 100644 |
29 |
--- a/media-video/cheese/cheese-3.34.0.ebuild |
30 |
+++ b/media-video/cheese/cheese-3.34.0-r1.ebuild |
31 |
@@ -3,7 +3,7 @@ |
32 |
|
33 |
EAPI=7 |
34 |
|
35 |
-inherit gnome.org meson vala virtualx xdg-utils |
36 |
+inherit gnome.org meson vala virtualx xdg |
37 |
|
38 |
DESCRIPTION="A cheesy program to take pictures and videos from your webcam" |
39 |
HOMEPAGE="https://wiki.gnome.org/Apps/Cheese" |
40 |
@@ -11,41 +11,30 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese" |
41 |
LICENSE="GPL-2+" |
42 |
SLOT="0/8" # subslot = libcheese soname version |
43 |
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
44 |
-IUSE="gtk-doc +introspection test X" |
45 |
-RESTRICT="test" # Tests fail |
46 |
+IUSE="gtk-doc +introspection test" |
47 |
+RESTRICT="!test? ( test )" |
48 |
|
49 |
-REQUIRED_USE="test? ( X )" |
50 |
-COMMON_DEPEND=" |
51 |
- >=dev-libs/glib-2.39.90:2 |
52 |
- >=x11-libs/gtk+-3.13.4:3[introspection?] |
53 |
- >=gnome-base/gnome-desktop-2.91.6:3= |
54 |
- >=media-libs/libcanberra-0.26[gtk3] |
55 |
+DEPEND=" |
56 |
>=media-libs/clutter-1.13.2:1.0[introspection?] |
57 |
- >=media-libs/clutter-gtk-0.91.8:1.0 |
58 |
media-libs/clutter-gst:3.0 |
59 |
- media-libs/cogl:1.0=[introspection?] |
60 |
- |
61 |
- media-video/gnome-video-effects |
62 |
+ >=media-libs/clutter-gtk-0.91.8:1.0 |
63 |
x11-libs/gdk-pixbuf:2[jpeg,introspection?] |
64 |
- |
65 |
+ >=dev-libs/glib-2.39.90:2 |
66 |
+ >=gnome-base/gnome-desktop-2.91.6:3= |
67 |
>=media-libs/gstreamer-1.4:1.0[introspection?] |
68 |
- >=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X?] |
69 |
- |
70 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) |
71 |
+ >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis] |
72 |
+ >=media-libs/gst-plugins-bad-1.4:1.0 |
73 |
+ >=x11-libs/gtk+-3.13.4:3 |
74 |
+ >=media-libs/libcanberra-0.26[gtk3] |
75 |
+ x11-libs/libX11 |
76 |
+ sys-apps/dbus |
77 |
+ media-video/gnome-video-effects |
78 |
+ introspection? ( >=dev-libs/gobject-introspection-1.56:= ) |
79 |
|
80 |
- X? ( |
81 |
- x11-base/xorg-proto |
82 |
- x11-libs/libX11 |
83 |
- ) |
84 |
-" |
85 |
+ media-libs/cogl:1.0=[introspection?] |
86 |
|
87 |
-DEPEND=" |
88 |
- ${COMMON_DEPEND} |
89 |
- test? ( x11-libs/libXtst ) |
90 |
" |
91 |
- |
92 |
-RDEPEND="${COMMON_DEPEND} |
93 |
- >=media-libs/gst-plugins-bad-1.4:1.0 |
94 |
+RDEPEND="${DEPEND} |
95 |
>=media-libs/gst-plugins-good-1.4:1.0 |
96 |
|
97 |
>=media-plugins/gst-plugins-jpeg-1.4:1.0 |
98 |
@@ -54,15 +43,18 @@ RDEPEND="${COMMON_DEPEND} |
99 |
" |
100 |
|
101 |
BDEPEND=" |
102 |
- $(vala_depend) |
103 |
+ gtk-doc? ( dev-util/gtk-doc ) |
104 |
+ dev-libs/libxslt |
105 |
app-text/docbook-xml-dtd:4.3 |
106 |
dev-util/itstool |
107 |
dev-libs/appstream-glib |
108 |
- >=dev-util/intltool-0.50 |
109 |
- dev-libs/libxslt |
110 |
dev-libs/libxml2:2 |
111 |
dev-util/glib-utils |
112 |
+ >=sys-devel/gettext-0.19.8 |
113 |
virtual/pkgconfig |
114 |
+ x11-base/xorg-proto |
115 |
+ test? ( x11-libs/libXtst ) |
116 |
+ $(vala_depend) |
117 |
" |
118 |
|
119 |
PATCHES=( |
120 |
@@ -71,9 +63,8 @@ PATCHES=( |
121 |
) |
122 |
|
123 |
src_prepare() { |
124 |
+ xdg_src_prepare |
125 |
vala_src_prepare |
126 |
- |
127 |
- default |
128 |
} |
129 |
|
130 |
src_configure() { |
131 |
@@ -95,9 +86,11 @@ src_test() { |
132 |
} |
133 |
|
134 |
pkg_postinst() { |
135 |
- xdg_icon_cache_update |
136 |
+ xdg_pkg_postinst |
137 |
+ gnome2_schemas_update |
138 |
} |
139 |
|
140 |
pkg_postrm() { |
141 |
- xdg_icon_cache_update |
142 |
+ xdg_pkg_postrm |
143 |
+ gnome2_schemas_update |
144 |
} |