summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2011-02-23 17:04:46 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2011-02-23 17:04:46 +0000
commitfc1f4196c45c3b4440830bd17ac8eeea12fe1ef4 (patch)
treeda00d61fa3913ae835df445371b0d2a4c3570925 /app-admin
parentBump to 0.10.3, lots of introspection building fixes (diff)
downloadgentoo-2-fc1f4196c45c3b4440830bd17ac8eeea12fe1ef4.tar.gz
gentoo-2-fc1f4196c45c3b4440830bd17ac8eeea12fe1ef4.tar.bz2
gentoo-2-fc1f4196c45c3b4440830bd17ac8eeea12fe1ef4.zip
Restrict incompatible scp-gnome versions, also fix bug 356197
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/system-config-printer-common/ChangeLog8
-rw-r--r--app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild5
-rw-r--r--app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild3
-rw-r--r--app-admin/system-config-printer-common/system-config-printer-common-1.3.1.ebuild3
4 files changed, 14 insertions, 5 deletions
diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index e17dc8d60872..5188d9190bb5 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/system-config-printer-common
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.31 2011/02/17 20:37:33 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.32 2011/02/23 17:04:46 reavertm Exp $
+
+ 23 Feb 2011; Maciej Mrozowski <reavertm@gentoo.org>
+ system-config-printer-common-1.2.2.ebuild,
+ system-config-printer-common-1.2.6.ebuild,
+ system-config-printer-common-1.3.1.ebuild:
+ Restrict incompatible scp-gnome versions, also fix bug 356197
*system-config-printer-common-1.3.1 (17 Feb 2011)
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild
index 1cbeb70799a2..5dd9a181f7c3 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild,v 1.5 2010/09/19 17:00:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild,v 1.6 2011/02/23 17:04:46 reavertm Exp $
EAPI="3"
@@ -38,6 +38,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!app-admin/system-config-printer:0
+ !<app-admin/system-config-printer-gnome-${PV}
policykit? ( sys-auth/polkit )
"
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild
index 2329194af285..38ddbe9f18ba 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.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/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild,v 1.2 2011/01/31 23:45:26 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.2.6.ebuild,v 1.3 2011/02/23 17:04:46 reavertm Exp $
EAPI="3"
@@ -39,6 +39,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!app-admin/system-config-printer:0
+ !<app-admin/system-config-printer-gnome-${PV}
policykit? ( sys-auth/polkit )
"
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.1.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.1.ebuild
index fc4ea1b9a0b9..ec64f694ad0d 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.1.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.1.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/app-admin/system-config-printer-common/system-config-printer-common-1.3.1.ebuild,v 1.1 2011/02/17 20:37:33 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.1.ebuild,v 1.2 2011/02/23 17:04:46 reavertm Exp $
EAPI="3"
@@ -39,6 +39,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!app-admin/system-config-printer:0
+ !<app-admin/system-config-printer-gnome-${PV}
policykit? ( sys-auth/polkit )
"