summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-01-04 10:39:39 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-01-04 10:39:39 +0000
commitd5711b8d8328ca60c9b43164674ada1e8e06f41e (patch)
tree01e8ce271b8e8123b177f562238f2d8b2577ad7a /net-libs
parentx86 stable, bug 299559 (diff)
downloadgentoo-2-d5711b8d8328ca60c9b43164674ada1e8e06f41e.tar.gz
gentoo-2-d5711b8d8328ca60c9b43164674ada1e8e06f41e.tar.bz2
gentoo-2-d5711b8d8328ca60c9b43164674ada1e8e06f41e.zip
Remove app-emulation/emul-linux-x86-compat (libstdc++.so.5) from RDEPEND since libstdc++.so.6 is used. Missing media-libs/jpeg-compat RDEPEND for x86 wrt #299570.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/xulrunner-bin/ChangeLog10
-rw-r--r--net-libs/xulrunner-bin/xulrunner-bin-1.8.1.19.ebuild6
2 files changed, 11 insertions, 5 deletions
diff --git a/net-libs/xulrunner-bin/ChangeLog b/net-libs/xulrunner-bin/ChangeLog
index f9154edace0a..460c6a6666b8 100644
--- a/net-libs/xulrunner-bin/ChangeLog
+++ b/net-libs/xulrunner-bin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-libs/xulrunner-bin
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner-bin/ChangeLog,v 1.18 2008/12/20 21:17:19 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner-bin/ChangeLog,v 1.19 2010/01/04 10:39:39 ssuominen Exp $
+
+ 04 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+ xulrunner-bin-1.8.1.19.ebuild:
+ Remove app-emulation/emul-linux-x86-compat (libstdc++.so.5) from RDEPEND
+ since libstdc++.so.6 is used. Missing media-libs/jpeg-compat RDEPEND for
+ x86 wrt #299570.
20 Dec 2008; Markus Meier <maekke@gentoo.org>
xulrunner-bin-1.8.1.19.ebuild:
diff --git a/net-libs/xulrunner-bin/xulrunner-bin-1.8.1.19.ebuild b/net-libs/xulrunner-bin/xulrunner-bin-1.8.1.19.ebuild
index f93f1b1db228..bd017f77ccc4 100644
--- a/net-libs/xulrunner-bin/xulrunner-bin-1.8.1.19.ebuild
+++ b/net-libs/xulrunner-bin/xulrunner-bin-1.8.1.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner-bin/xulrunner-bin-1.8.1.19.ebuild,v 1.2 2008/12/20 21:17:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner-bin/xulrunner-bin-1.8.1.19.ebuild,v 1.3 2010/01/04 10:39:39 ssuominen Exp $
inherit eutils multilib mozilla-launcher
@@ -21,11 +21,11 @@ RDEPEND="x11-libs/libXrender
x11-libs/libXmu
x86? (
>=x11-libs/gtk+-2.2
+ || ( media-libs/jpeg-compat <media-libs/jpeg-7 )
)
amd64? (
app-emulation/emul-linux-x86-baselibs
app-emulation/emul-linux-x86-gtklibs
- app-emulation/emul-linux-x86-compat
)"
S="${WORKDIR}/usr/lib/xulrunner/"