diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-06-29 03:41:57 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-06-29 03:41:57 +0000 |
| commit | 73d0d6a2f3d988a7abdf4b74f32248887fe3fc03 (patch) | |
| tree | 7bb2816f692afb07fc3ddc84472bc6da56f105a9 /gnome-extra | |
| parent | fix ChangeLog typo (diff) | |
| download | gentoo-2-73d0d6a2f3d988a7abdf4b74f32248887fe3fc03.tar.gz gentoo-2-73d0d6a2f3d988a7abdf4b74f32248887fe3fc03.tar.bz2 gentoo-2-73d0d6a2f3d988a7abdf4b74f32248887fe3fc03.zip | |
Allow only system-config-printer, not system-config-printer-gnome, to help portage dep resolution (bug #553128, thanks to Marek Bartosiewicz).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'gnome-extra')
3 files changed, 11 insertions, 7 deletions
diff --git a/gnome-extra/cinnamon-control-center/ChangeLog b/gnome-extra/cinnamon-control-center/ChangeLog index 976c9b8364b4..b8b519a3fd3f 100644 --- a/gnome-extra/cinnamon-control-center/ChangeLog +++ b/gnome-extra/cinnamon-control-center/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/cinnamon-control-center # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.20 2015/06/14 01:57:50 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.21 2015/06/29 03:41:57 tetromino Exp $ + + 29 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + cinnamon-control-center-2.4.2-r2.ebuild, + cinnamon-control-center-2.6.0.ebuild: + Allow only system-config-printer, not system-config-printer-gnome, to help + portage dep resolution (bug #553128, thanks to Marek Bartosiewicz). *cinnamon-control-center-2.6.0 (13 Jun 2015) diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild index 1877ea350f16..8c2b70855c22 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild,v 1.4 2015/05/12 18:44:43 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild,v 1.5 2015/06/29 03:41:57 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -58,8 +58,7 @@ RDEPEND="${COMMON_DEPEND} x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( - || ( >=app-admin/system-config-printer-gnome-1.3.5 - app-admin/system-config-printer ) + app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) " diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild index 45ef78f212bd..c6dd90e67a92 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild,v 1.1 2015/06/14 01:57:50 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild,v 1.2 2015/06/29 03:41:57 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -57,8 +57,7 @@ RDEPEND="${COMMON_DEPEND} x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( - || ( >=app-admin/system-config-printer-gnome-1.3.5 - app-admin/system-config-printer ) + app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) " |