summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-08-02 16:02:27 +0000
committerUlrich Müller <ulm@gentoo.org>2013-08-02 16:02:27 +0000
commit59aa5691e82783086a3655f34635f71a5c8c0ee9 (patch)
tree5219f99c62fe15531b205c69f4004bf27cdc8784 /x11-libs
parentFix up the .desktop file to work around a Skype bug with PulseAudio 4.0. Drop... (diff)
downloadgentoo-2-59aa5691e82783086a3655f34635f71a5c8c0ee9.tar.gz
gentoo-2-59aa5691e82783086a3655f34635f71a5c8c0ee9.tar.bz2
gentoo-2-59aa5691e82783086a3655f34635f71a5c8c0ee9.zip
Update dependency on virtual/jpeg.
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/motif/ChangeLog6
-rw-r--r--x11-libs/motif/motif-2.3.4-r1.ebuild6
-rw-r--r--x11-libs/motif/motif-2.3.4.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index 1587384f9a34..cd58ee2c01a8 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/motif
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.34 2013/08/01 19:47:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.35 2013/08/02 16:02:27 ulm Exp $
+
+ 02 Aug 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4.ebuild,
+ motif-2.3.4-r1.ebuild:
+ Update dependency on virtual/jpeg.
01 Aug 2013; Ulrich Müller <ulm@gentoo.org> motif-2.2.3-r12.ebuild,
motif-2.3.4-r1.ebuild:
diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
index 7a1389628910..11282cc2e5bf 100644
--- a/x11-libs/motif/motif-2.3.4-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.21 2013/08/01 19:47:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.22 2013/08/02 16:02:27 ulm Exp $
EAPI=5
@@ -40,12 +40,12 @@ RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
) )
|| ( (
unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] )
)
(
unicode? ( virtual/libiconv )
- jpeg? ( virtual/jpeg )
+ jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
abi_x86_32? ( amd64? (
jpeg? ( app-emulation/emul-linux-x86-baselibs )
diff --git a/x11-libs/motif/motif-2.3.4.ebuild b/x11-libs/motif/motif-2.3.4.ebuild
index d26e8ece3dcb..792364446a68 100644
--- a/x11-libs/motif/motif-2.3.4.ebuild
+++ b/x11-libs/motif/motif-2.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4.ebuild,v 1.12 2013/03/18 22:45:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4.ebuild,v 1.13 2013/08/02 16:02:27 ulm Exp $
EAPI=4
@@ -20,8 +20,8 @@ RDEPEND="x11-libs/libXmu
x11-libs/libXp
unicode? ( virtual/libiconv )
xft? ( x11-libs/libXft )
- jpeg? ( virtual/jpeg )
- png? ( >=media-libs/libpng-1.4 )"
+ jpeg? ( virtual/jpeg:0 )
+ png? ( >=media-libs/libpng-1.4:0 )"
DEPEND="${RDEPEND}
sys-devel/flex
|| ( dev-util/byacc sys-freebsd/freebsd-ubin )