| 1 |
commit: d71f1408305fc1f2cd348c12cde68aaf090015f6 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 28 15:56:13 2012 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 28 19:36:24 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d71f1408 |
| 7 |
|
| 8 |
media-video/cheese: 3.4.2-r1 → 3.6.1 |
| 9 |
|
| 10 |
--- |
| 11 |
...{cheese-3.4.2-r1.ebuild => cheese-3.6.1.ebuild} | 59 ++++++++----------- |
| 12 |
media-video/cheese/cheese-9999.ebuild | 59 ++++++++----------- |
| 13 |
2 files changed, 50 insertions(+), 68 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-video/cheese/cheese-3.4.2-r1.ebuild b/media-video/cheese/cheese-3.6.1.ebuild |
| 16 |
similarity index 61% |
| 17 |
rename from media-video/cheese/cheese-3.4.2-r1.ebuild |
| 18 |
rename to media-video/cheese/cheese-3.6.1.ebuild |
| 19 |
index ecf211b..f33e2eb 100644 |
| 20 |
--- a/media-video/cheese/cheese-3.4.2-r1.ebuild |
| 21 |
+++ b/media-video/cheese/cheese-3.6.1.ebuild |
| 22 |
@@ -3,6 +3,7 @@ |
| 23 |
# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.4.2.ebuild,v 1.1 2012/05/24 08:04:54 tetromino Exp $ |
| 24 |
|
| 25 |
EAPI="4" |
| 26 |
+GCONF_DEBUG="no" |
| 27 |
GNOME2_LA_PUNT="yes" |
| 28 |
|
| 29 |
inherit gnome2 virtualx |
| 30 |
@@ -15,82 +16,72 @@ HOMEPAGE="http://www.gnome.org/projects/cheese/" |
| 31 |
|
| 32 |
LICENSE="GPL-2" |
| 33 |
SLOT="0" |
| 34 |
-IUSE="doc +introspection sendto test" |
| 35 |
+IUSE="+introspection sendto test" |
| 36 |
if [[ ${PV} = 9999 ]]; then |
| 37 |
+ IUSE="${IUSE} doc" |
| 38 |
KEYWORDS="" |
| 39 |
else |
| 40 |
KEYWORDS="~amd64 ~x86" |
| 41 |
fi |
| 42 |
|
| 43 |
COMMON_DEPEND=" |
| 44 |
- >=dev-libs/glib-2.28.0:2 |
| 45 |
+ >=dev-libs/glib-2.28:2 |
| 46 |
>=dev-libs/libgee-0.6.3:0 |
| 47 |
- >=x11-libs/gtk+-2.99.4:3[introspection?] |
| 48 |
+ >=x11-libs/gtk+-3.4.4:3[introspection?] |
| 49 |
>=x11-libs/cairo-1.10 |
| 50 |
>=x11-libs/pango-1.28.0 |
| 51 |
>=sys-fs/udev-171[gudev] |
| 52 |
>=gnome-base/gnome-desktop-2.91.6:3 |
| 53 |
>=gnome-base/librsvg-2.32.0:2 |
| 54 |
>=media-libs/libcanberra-0.26[gtk3] |
| 55 |
- >=media-libs/clutter-1.6.1:1.0[introspection?] |
| 56 |
+ >=media-libs/clutter-1.10:1.0[introspection?] |
| 57 |
>=media-libs/clutter-gtk-0.91.8:1.0 |
| 58 |
- >=media-libs/clutter-gst-1.0.0:1.0 |
| 59 |
+ >=media-libs/clutter-gst-1.9:2.0 |
| 60 |
|
| 61 |
media-video/gnome-video-effects |
| 62 |
x11-libs/gdk-pixbuf:2[jpeg,introspection?] |
| 63 |
- x11-libs/mx |
| 64 |
x11-libs/libX11 |
| 65 |
x11-libs/libXtst |
| 66 |
|
| 67 |
- >=media-libs/gstreamer-0.10.32:0.10[introspection?] |
| 68 |
- >=media-libs/gst-plugins-base-0.10.32:0.10[introspection?] |
| 69 |
+ media-libs/gstreamer:1.0[introspection?] |
| 70 |
+ media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] |
| 71 |
|
| 72 |
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )" |
| 73 |
RDEPEND="${COMMON_DEPEND} |
| 74 |
- >=media-libs/gst-plugins-bad-0.10.19 |
| 75 |
- >=media-libs/gst-plugins-good-0.10.16:0.10 |
| 76 |
- >=media-plugins/gst-plugins-ogg-0.10.20:0.10 |
| 77 |
- >=media-plugins/gst-plugins-pango-0.10.20:0.10 |
| 78 |
- >=media-plugins/gst-plugins-theora-0.10.20:0.10 |
| 79 |
- >=media-plugins/gst-plugins-vorbis-0.10.20:0.10 |
| 80 |
+ media-libs/gst-plugins-bad:1.0 |
| 81 |
+ media-libs/gst-plugins-good:1.0 |
| 82 |
|
| 83 |
- media-plugins/gst-plugins-jpeg:0.10 |
| 84 |
- media-plugins/gst-plugins-v4l2:0.10 |
| 85 |
- media-plugins/gst-plugins-vp8:0.10 |
| 86 |
- |
| 87 |
- || ( media-plugins/gst-plugins-x:0.10 |
| 88 |
- media-plugins/gst-plugins-xvideo:0.10 ) |
| 89 |
+ media-plugins/gst-plugins-jpeg:1.0 |
| 90 |
+ media-plugins/gst-plugins-v4l2:1.0 |
| 91 |
+ media-plugins/gst-plugins-vp8:1.0 |
| 92 |
|
| 93 |
sendto? ( >=gnome-extra/nautilus-sendto-2.91 )" |
| 94 |
DEPEND="${COMMON_DEPEND} |
| 95 |
- virtual/pkgconfig |
| 96 |
- >=dev-util/intltool-0.40 |
| 97 |
- |
| 98 |
app-text/docbook-xml-dtd:4.3 |
| 99 |
dev-libs/libxml2:2 |
| 100 |
+ >=dev-util/gtk-doc-1.14 |
| 101 |
+ >=dev-util/intltool-0.50 |
| 102 |
dev-util/itstool |
| 103 |
+ virtual/pkgconfig |
| 104 |
x11-proto/xf86vidmodeproto |
| 105 |
- |
| 106 |
- doc? ( >=dev-util/gtk-doc-1.14 ) |
| 107 |
test? ( dev-libs/glib:2[utils] )" |
| 108 |
|
| 109 |
if [[ ${PV} = 9999 ]]; then |
| 110 |
- DEPEND+=" dev-lang/vala:0.18" |
| 111 |
+ DEPEND="${DEPEND} |
| 112 |
+ dev-lang/vala:0.18 |
| 113 |
+ doc? ( >=dev-util/gtk-doc-1.14 )" |
| 114 |
fi |
| 115 |
|
| 116 |
-pkg_setup() { |
| 117 |
+src_configure() { |
| 118 |
+ DOCS="AUTHORS ChangeLog NEWS README" |
| 119 |
G2CONF="${G2CONF} |
| 120 |
- VALAC=$(type -p valac-0.18) |
| 121 |
+ GST_INSPECT=$(type -P true) |
| 122 |
+ VALAC=$(type -P valac-0.18) |
| 123 |
$(use_enable introspection) |
| 124 |
--disable-lcov |
| 125 |
--disable-static" |
| 126 |
- DOCS="AUTHORS ChangeLog NEWS README" |
| 127 |
-} |
| 128 |
+ [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" |
| 129 |
|
| 130 |
-src_configure() { |
| 131 |
- # Work around sandbox violations when FEATURES=-userpriv caused by |
| 132 |
- # gst-inspect-0.10 (bug #410061) |
| 133 |
- unset DISPLAY |
| 134 |
gnome2_src_configure |
| 135 |
} |
| 136 |
|
| 137 |
|
| 138 |
diff --git a/media-video/cheese/cheese-9999.ebuild b/media-video/cheese/cheese-9999.ebuild |
| 139 |
index ecf211b..f33e2eb 100644 |
| 140 |
--- a/media-video/cheese/cheese-9999.ebuild |
| 141 |
+++ b/media-video/cheese/cheese-9999.ebuild |
| 142 |
@@ -3,6 +3,7 @@ |
| 143 |
# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.4.2.ebuild,v 1.1 2012/05/24 08:04:54 tetromino Exp $ |
| 144 |
|
| 145 |
EAPI="4" |
| 146 |
+GCONF_DEBUG="no" |
| 147 |
GNOME2_LA_PUNT="yes" |
| 148 |
|
| 149 |
inherit gnome2 virtualx |
| 150 |
@@ -15,82 +16,72 @@ HOMEPAGE="http://www.gnome.org/projects/cheese/" |
| 151 |
|
| 152 |
LICENSE="GPL-2" |
| 153 |
SLOT="0" |
| 154 |
-IUSE="doc +introspection sendto test" |
| 155 |
+IUSE="+introspection sendto test" |
| 156 |
if [[ ${PV} = 9999 ]]; then |
| 157 |
+ IUSE="${IUSE} doc" |
| 158 |
KEYWORDS="" |
| 159 |
else |
| 160 |
KEYWORDS="~amd64 ~x86" |
| 161 |
fi |
| 162 |
|
| 163 |
COMMON_DEPEND=" |
| 164 |
- >=dev-libs/glib-2.28.0:2 |
| 165 |
+ >=dev-libs/glib-2.28:2 |
| 166 |
>=dev-libs/libgee-0.6.3:0 |
| 167 |
- >=x11-libs/gtk+-2.99.4:3[introspection?] |
| 168 |
+ >=x11-libs/gtk+-3.4.4:3[introspection?] |
| 169 |
>=x11-libs/cairo-1.10 |
| 170 |
>=x11-libs/pango-1.28.0 |
| 171 |
>=sys-fs/udev-171[gudev] |
| 172 |
>=gnome-base/gnome-desktop-2.91.6:3 |
| 173 |
>=gnome-base/librsvg-2.32.0:2 |
| 174 |
>=media-libs/libcanberra-0.26[gtk3] |
| 175 |
- >=media-libs/clutter-1.6.1:1.0[introspection?] |
| 176 |
+ >=media-libs/clutter-1.10:1.0[introspection?] |
| 177 |
>=media-libs/clutter-gtk-0.91.8:1.0 |
| 178 |
- >=media-libs/clutter-gst-1.0.0:1.0 |
| 179 |
+ >=media-libs/clutter-gst-1.9:2.0 |
| 180 |
|
| 181 |
media-video/gnome-video-effects |
| 182 |
x11-libs/gdk-pixbuf:2[jpeg,introspection?] |
| 183 |
- x11-libs/mx |
| 184 |
x11-libs/libX11 |
| 185 |
x11-libs/libXtst |
| 186 |
|
| 187 |
- >=media-libs/gstreamer-0.10.32:0.10[introspection?] |
| 188 |
- >=media-libs/gst-plugins-base-0.10.32:0.10[introspection?] |
| 189 |
+ media-libs/gstreamer:1.0[introspection?] |
| 190 |
+ media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] |
| 191 |
|
| 192 |
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )" |
| 193 |
RDEPEND="${COMMON_DEPEND} |
| 194 |
- >=media-libs/gst-plugins-bad-0.10.19 |
| 195 |
- >=media-libs/gst-plugins-good-0.10.16:0.10 |
| 196 |
- >=media-plugins/gst-plugins-ogg-0.10.20:0.10 |
| 197 |
- >=media-plugins/gst-plugins-pango-0.10.20:0.10 |
| 198 |
- >=media-plugins/gst-plugins-theora-0.10.20:0.10 |
| 199 |
- >=media-plugins/gst-plugins-vorbis-0.10.20:0.10 |
| 200 |
+ media-libs/gst-plugins-bad:1.0 |
| 201 |
+ media-libs/gst-plugins-good:1.0 |
| 202 |
|
| 203 |
- media-plugins/gst-plugins-jpeg:0.10 |
| 204 |
- media-plugins/gst-plugins-v4l2:0.10 |
| 205 |
- media-plugins/gst-plugins-vp8:0.10 |
| 206 |
- |
| 207 |
- || ( media-plugins/gst-plugins-x:0.10 |
| 208 |
- media-plugins/gst-plugins-xvideo:0.10 ) |
| 209 |
+ media-plugins/gst-plugins-jpeg:1.0 |
| 210 |
+ media-plugins/gst-plugins-v4l2:1.0 |
| 211 |
+ media-plugins/gst-plugins-vp8:1.0 |
| 212 |
|
| 213 |
sendto? ( >=gnome-extra/nautilus-sendto-2.91 )" |
| 214 |
DEPEND="${COMMON_DEPEND} |
| 215 |
- virtual/pkgconfig |
| 216 |
- >=dev-util/intltool-0.40 |
| 217 |
- |
| 218 |
app-text/docbook-xml-dtd:4.3 |
| 219 |
dev-libs/libxml2:2 |
| 220 |
+ >=dev-util/gtk-doc-1.14 |
| 221 |
+ >=dev-util/intltool-0.50 |
| 222 |
dev-util/itstool |
| 223 |
+ virtual/pkgconfig |
| 224 |
x11-proto/xf86vidmodeproto |
| 225 |
- |
| 226 |
- doc? ( >=dev-util/gtk-doc-1.14 ) |
| 227 |
test? ( dev-libs/glib:2[utils] )" |
| 228 |
|
| 229 |
if [[ ${PV} = 9999 ]]; then |
| 230 |
- DEPEND+=" dev-lang/vala:0.18" |
| 231 |
+ DEPEND="${DEPEND} |
| 232 |
+ dev-lang/vala:0.18 |
| 233 |
+ doc? ( >=dev-util/gtk-doc-1.14 )" |
| 234 |
fi |
| 235 |
|
| 236 |
-pkg_setup() { |
| 237 |
+src_configure() { |
| 238 |
+ DOCS="AUTHORS ChangeLog NEWS README" |
| 239 |
G2CONF="${G2CONF} |
| 240 |
- VALAC=$(type -p valac-0.18) |
| 241 |
+ GST_INSPECT=$(type -P true) |
| 242 |
+ VALAC=$(type -P valac-0.18) |
| 243 |
$(use_enable introspection) |
| 244 |
--disable-lcov |
| 245 |
--disable-static" |
| 246 |
- DOCS="AUTHORS ChangeLog NEWS README" |
| 247 |
-} |
| 248 |
+ [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" |
| 249 |
|
| 250 |
-src_configure() { |
| 251 |
- # Work around sandbox violations when FEATURES=-userpriv caused by |
| 252 |
- # gst-inspect-0.10 (bug #410061) |
| 253 |
- unset DISPLAY |
| 254 |
gnome2_src_configure |
| 255 |
} |
Archives