summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-01 20:48:54 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-01 20:48:54 +0000
commit9eca3384e6c8ee5775bd27bdb735f09ba0f54a67 (patch)
treeadaa74e3b6c267f187b35f7043bd2398451b2140 /app-emulation
parentold (diff)
downloadgentoo-2-9eca3384e6c8ee5775bd27bdb735f09ba0f54a67.tar.gz
gentoo-2-9eca3384e6c8ee5775bd27bdb735f09ba0f54a67.tar.bz2
gentoo-2-9eca3384e6c8ee5775bd27bdb735f09ba0f54a67.zip
Fix libjpeg.so.62 dependency.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/crossover-office-pro-bin/ChangeLog8
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild6
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild6
3 files changed, 12 insertions, 8 deletions
diff --git a/app-emulation/crossover-office-pro-bin/ChangeLog b/app-emulation/crossover-office-pro-bin/ChangeLog
index 4020713f36f4..57bbb9fd7783 100644
--- a/app-emulation/crossover-office-pro-bin/ChangeLog
+++ b/app-emulation/crossover-office-pro-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/crossover-office-pro-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/ChangeLog,v 1.25 2012/12/19 17:07:58 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/ChangeLog,v 1.26 2013/08/01 20:48:54 ssuominen Exp $
+
+ 01 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+ crossover-office-pro-bin-9.1.0.ebuild, crossover-office-pro-bin-9.2.0.ebuild:
+ Fix libjpeg.so.62 dependency.
19 Dec 2012; Michael Sterrett <mr_bones_@gentoo.org>
-crossover-office-pro-bin-4.2.ebuild:
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
index b8a02a9782c6..875f52f05c84 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild,v 1.5 2012/05/10 02:12:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild,v 1.6 2013/08/01 20:48:54 ssuominen Exp $
EAPI="3"
@@ -25,7 +25,7 @@ RDEPEND="sys-libs/glibc
dev-util/desktop-file-utils
nas? ( media-libs/nas )
amd64? ( app-emulation/emul-linux-x86-xlibs )
- media-libs/jpeg:62
+ || ( virtual/jpeg:62 media-libs/jpeg:62 )
media-libs/libpng:1.2"
S=${WORKDIR}
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
index 53120a560064..f280f3022cb8 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild,v 1.4 2012/05/10 02:12:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild,v 1.5 2013/08/01 20:48:54 ssuominen Exp $
EAPI="3"
@@ -25,7 +25,7 @@ RDEPEND="sys-libs/glibc
dev-util/desktop-file-utils
nas? ( media-libs/nas )
amd64? ( app-emulation/emul-linux-x86-xlibs )
- media-libs/jpeg:62
+ || ( virtual/jpeg:62 media-libs/jpeg:62 )
media-libs/libpng:1.2"
S=${WORKDIR}