diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-11-07 22:08:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-11-07 22:08:20 +0000 |
| commit | 04e17e94731f662317a8b0c30979f34c9851e3c6 (patch) | |
| tree | 6315c79e86dbdabe14a50c9ac7e63dd89c14e3eb /dev-java | |
| parent | Bug #344167 - Remove unused bash-completion-install.diff. (diff) | |
| download | gentoo-2-04e17e94731f662317a8b0c30979f34c9851e3c6.tar.gz gentoo-2-04e17e94731f662317a8b0c30979f34c9851e3c6.tar.bz2 gentoo-2-04e17e94731f662317a8b0c30979f34c9851e3c6.zip | |
Fix libjpeg depend to accept libjpeg-turbo >= 1.0.90 wrt #327487.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/icedtea6-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog index 987bfdd1d8ec..cf39b9b7c410 100644 --- a/dev-java/icedtea6-bin/ChangeLog +++ b/dev-java/icedtea6-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icedtea6-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.40 2010/10/13 18:56:37 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.41 2010/11/07 22:08:20 ssuominen Exp $ + + 07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> + icedtea6-bin-1.9.1.ebuild: + Fix libjpeg depend to accept libjpeg-turbo >= 1.0.90 wrt #327487. 13 Oct 2010; Markos Chandras <hwoarang@gentoo.org> icedtea6-bin-1.9.ebuild, icedtea6-bin-1.9.1.ebuild: diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild index 0f6ad8bbcafa..d72044d15347 100644 --- a/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild +++ b/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild,v 1.3 2010/10/13 18:56:37 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild,v 1.4 2010/11/07 22:08:20 ssuominen Exp $ EAPI="1" @@ -35,7 +35,7 @@ S="${WORKDIR}/${PN}-${TARBALL_VERSION}" RDEPEND=">=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=media-libs/giflib-4.1.6-r1 - >=media-libs/jpeg-8 + || ( >=media-libs/jpeg-8 >=media-libs/libjpeg-turbo-1.0.90 ) >=media-libs/libpng-1.4:0 >=sys-libs/zlib-1.2.3-r1 alsa? ( >=media-libs/alsa-lib-1.0.20 ) |