summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2011-09-10 17:25:29 +0000
committerPacho Ramos <pacho@gentoo.org>2011-09-10 17:25:29 +0000
commitc2326562e8d996e66d590d07ff9311a8b805ba6d (patch)
treeca891c5e7eeeb001d624221776fa26833b9b4d4d /media-video
parent[app-emulation/xen-tools] Uncomment xl settings, fix bug 370817, adjust init.... (diff)
downloadhistorical-c2326562e8d996e66d590d07ff9311a8b805ba6d.tar.gz
historical-c2326562e8d996e66d590d07ff9311a8b805ba6d.tar.bz2
historical-c2326562e8d996e66d590d07ff9311a8b805ba6d.zip
Fix dependencies as explained in bug #382011.
Package-Manager: portage-2.1.10.14/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/cheese/ChangeLog5
-rw-r--r--media-video/cheese/Manifest20
-rw-r--r--media-video/cheese/cheese-2.32.0.ebuild6
3 files changed, 11 insertions, 20 deletions
diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index 08c58d595316..177eb269209b 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/cheese
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.49 2011/08/18 05:54:49 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.50 2011/09/10 17:25:29 pacho Exp $
+
+ 10 Sep 2011; Pacho Ramos <pacho@gentoo.org> cheese-2.32.0.ebuild:
+ Fix dependencies as explained in bug #382011.
*cheese-3.0.2 (18 Aug 2011)
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 9736354cc93f..e6f4d9719e26 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -3,24 +3,14 @@ Hash: SHA1
DIST cheese-2.32.0.tar.bz2 5303805 RMD160 a52845cd51cc223854141d3f1a5f30f934109e24 SHA1 32c8d087f796799153f9365e9e0082068db0e0cb SHA256 8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087
DIST cheese-3.0.2.tar.xz 4989420 RMD160 ba7bf3f5279d3cd6b524440870ddbd8f7b374418 SHA1 1823362a282ef5b2b5e9f8921a94d012a042ffa4 SHA256 8202413e3fd216e7534bcdc17cc6ec47ad1db4532848a3151d01260f810dff7c
-EBUILD cheese-2.32.0.ebuild 1849 RMD160 2cb38572cce85c868405c16ed193e15742b88d8a SHA1 47efdc3b9a6cb617806b8096f6b5ba83de540573 SHA256 753b5d184017784c9aea8312ae01b1dd5b2fa4f88cb83e56314138dcd7cbeab2
+EBUILD cheese-2.32.0.ebuild 1816 RMD160 10d5a58fef11dac1347428476706e07f6b574131 SHA1 7c0ca0f57a009116007a75d73ef379d29caaefec SHA256 69d3dd43831914efa426dd47e66d161396b872055e4564f8d2f3f4a3f61ad075
EBUILD cheese-3.0.2.ebuild 2093 RMD160 ed84ee7de4cad94ca62048702bd0ac69a889a1af SHA1 106c4187e4e4cc61a5d392d9d8ccffdf74902442 SHA256 c51d1232d3fc26ac004b23359315e93a917edea1da5d0bee407d10e878484c8d
-MISC ChangeLog 7787 RMD160 c6b75c1843ffb5b1dd2c3e9fb527177573ca18a9 SHA1 de0c528dc619b992acaa9ac08518b0b9de5e523c SHA256 3bfd603623886e9d084631a467f6485a1b60de9d0c41b2846de3d2edf61b22a7
+MISC ChangeLog 7901 RMD160 62eb5eea77ae5e33d08e4d172434c37e782faf5d SHA1 d043f2762fd41bca81b838df39b6d3d5b05a386f SHA256 0530af98662415917763595a50839ac5e89f84915786cd5b7dded0bcc432015a
MISC metadata.xml 453 RMD160 2afcc8fd37b5593c824efb963f13cc7099a45172 SHA1 bb32d13544a276a3987387560eabbd48f530b42c SHA256 44ec0b1d8ce328befc60c0cd9cc969b2e2ee887b509e5e3f847b65a1302f8397
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJOTKkvAAoJEO/kOhxWD91kXY8P/jXo2kVuGwOBbxL573UcbnzY
-WTwBqgUzlp3vZ0jFpioYohd0OXILZ2Unv3//ncU0fd/v7ZItD4fOQUE816+ukZQY
-dfMHQ/MD277a+H9s7s46zOtVsfXuNwjE8+bVarqn6+b4jDCo0/8Q07u56YveY7+W
-XVYB44aNrnrzKHGEaBCWEuW+PZYoNC4QL4IehASA2Lv1LDdUVnTWrs+1TD8r39SN
-XtIeLU7GXkpv3WmjxUkHZAVTZoQK8jHXAm+pwS61TZLrrd/IbtDQ+6okqkcEBffE
-js1KSsXCbxRXL0wPsv5r+U//JN7WjK5LMJEtCtP48ni8HWenYgM2ayAR+8V5N1NH
-hxt6VH32g9jZ0YHx1uqeazZDBHESVsaQs0BSH898DFV2amW/RZw4lr4rIezCB1Jk
-8NPfhjWyz4N1Q0wqE57M20xjn0Li/NRuw0Zmp+1Lg5RZ7Yv6gQ7iQdDBtEUh8i8O
-FQRxN7kP3FbzjwyY2ABGdxX6aH0TB2Cm1oYHpj1KBe6Nfw6Xa3vYUHNGfzzNhg4D
-ARdtwoO1XpXJS9dh2xwW36B5q/RtpAXN6fGiWe1LC4pjIHOIto3gp+AV2qTDu5lv
-CvVF6CVg89WvWeKMUVnnPHsq9f+Bc8RlfIp7LhYsDeoZxxT7Lky9j/s5XbFghuj3
-xCBDlLIqyJyM50U7Rujt
-=EcFB
+iEYEARECAAYFAk5rnY8ACgkQCaWpQKGI+9TlcwCfVX97qUO+mYK+fq4AamF+mKti
+CDUAn2cqmvbRKRlYkEonc5QbmMCpylD9
+=EgMG
-----END PGP SIGNATURE-----
diff --git a/media-video/cheese/cheese-2.32.0.ebuild b/media-video/cheese/cheese-2.32.0.ebuild
index 3fb05b70ee2d..fd07f9675a10 100644
--- a/media-video/cheese/cheese-2.32.0.ebuild
+++ b/media-video/cheese/cheese-2.32.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.32.0.ebuild,v 1.12 2011/06/09 01:28:06 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.32.0.ebuild,v 1.13 2011/09/10 17:25:29 pacho Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -18,9 +18,7 @@ IUSE="doc"
COMMON_DEPEND=">=dev-libs/dbus-glib-0.7
>=dev-libs/glib-2.16:2
>=x11-libs/gtk+-2.19.1:2
- || (
- x11-libs/gtk+:2[jpeg]
- x11-libs/gdk-pixbuf:2[jpeg] )
+ x11-libs/gdk-pixbuf:2[jpeg]
>=x11-libs/cairo-1.4
>=x11-libs/pango-1.18
>=sys-apps/dbus-1[X]