summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2015-06-25 02:44:53 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2015-06-25 02:44:53 +0000
commit5e388edf8a68e2178e1186c62e5f4e9266d5b49e (patch)
tree85d001f58d5441c10eb56307126f637ef7a8ad05 /gnome-base/gnome-control-center
parentCall python_setup before esetup.py in python_prepare_all, bug 552906. (diff)
downloadgentoo-2-5e388edf8a68e2178e1186c62e5f4e9266d5b49e.tar.gz
gentoo-2-5e388edf8a68e2178e1186c62e5f4e9266d5b49e.tar.bz2
gentoo-2-5e388edf8a68e2178e1186c62e5f4e9266d5b49e.zip
Allow system-config-printer dep in old ebuild (bug #553198, thanks to Patrick Lauer).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'gnome-base/gnome-control-center')
-rw-r--r--gnome-base/gnome-control-center/ChangeLog7
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild5
2 files changed, 9 insertions, 3 deletions
diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index ef42e7dc24a5..e2c457eb841c 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-control-center
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.168 2015/06/21 12:05:32 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.169 2015/06/25 02:44:53 tetromino Exp $
+
+ 25 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-control-center-3.14.2-r1.ebuild:
+ Allow system-config-printer dep in old ebuild (bug #553198, thanks to Patrick
+ Lauer).
21 Jun 2015; Mikle Kolyada <zlogene@gentoo.org>
gnome-control-center-3.14.5.ebuild:
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
index 42e200214177..3cc62b8712d9 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.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-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild,v 1.3 2015/03/15 13:22:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild,v 1.4 2015/06/25 02:44:53 tetromino Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -88,7 +88,8 @@ 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-gnome-1.3.5
+ app-admin/system-config-printer )
net-print/cups-pk-helper )
input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
i18n? ( >=gnome-base/libgnomekbd-3 )