summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-10-15 15:17:27 +0000
committerPacho Ramos <pacho@gentoo.org>2014-10-15 15:17:27 +0000
commit4686a13eb6b7ac34854de9c507770582a0e79108 (patch)
tree82b9c810b862d3969f4e84e8fcf40b58b45b36bf /net-print
parentversion bump 31.x ESR for security bug 525474; dropped 17.x because upstream ... (diff)
downloadgentoo-2-4686a13eb6b7ac34854de9c507770582a0e79108.tar.gz
gentoo-2-4686a13eb6b7ac34854de9c507770582a0e79108.tar.bz2
gentoo-2-4686a13eb6b7ac34854de9c507770582a0e79108.zip
Support multilib providers for deps. Bump to EAPI=5.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cndrvcups-lb/ChangeLog6
-rw-r--r--net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild18
-rw-r--r--net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild16
3 files changed, 24 insertions, 16 deletions
diff --git a/net-print/cndrvcups-lb/ChangeLog b/net-print/cndrvcups-lb/ChangeLog
index fbe6dc5a7f0f..8c7cf375a909 100644
--- a/net-print/cndrvcups-lb/ChangeLog
+++ b/net-print/cndrvcups-lb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cndrvcups-lb
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.4 2014/09/25 09:28:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.5 2014/10/15 15:17:27 pacho Exp $
+
+ 15 Oct 2014; Pacho Ramos <pacho@gentoo.org> cndrvcups-lb-2.70-r2.ebuild,
+ cndrvcups-lb-2.90.ebuild:
+ Support multilib providers for deps. Bump to EAPI=5.
*cndrvcups-lb-2.90 (25 Sep 2014)
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
index 73c1d882a79b..4f8aa61c16b1 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild,v 1.1 2013/10/14 18:23:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild,v 1.2 2014/10/15 15:17:27 pacho Exp $
EAPI=5
inherit eutils autotools multilib versionator
@@ -25,12 +25,14 @@ RDEPEND="
net-print/cups
~net-print/cndrvcups-common-lb-${PV}
x11-libs/gtk+:2
- amd64? (
- app-emulation/emul-linux-x86-baselibs
- )
- x86? (
- dev-libs/libxml2
- virtual/jpeg:62
+ || (
+ (
+ >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+ virtual/jpeg:62[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
)
"
DEPEND="${DEPEND}"
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
index 18c5067a1e9d..3f5dd9d37460 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild,v 1.1 2014/09/25 09:28:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild,v 1.2 2014/10/15 15:17:27 pacho Exp $
EAPI=5
inherit eutils autotools multilib versionator
@@ -25,12 +25,14 @@ RDEPEND="
net-print/cups
~net-print/cndrvcups-common-lb-${PV}
x11-libs/gtk+:2
- amd64? (
- app-emulation/emul-linux-x86-baselibs
- )
- x86? (
- dev-libs/libxml2
- virtual/jpeg:62
+ || (
+ (
+ >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+ virtual/jpeg:62[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
)
"
DEPEND="${DEPEND}"