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 | 13c35427d4a6d1838078a255f4d7bcf9206e1000 (patch) | |
| tree | 30daa73ae9d1b47b26fe026e61fe7b61a5dd2d7b /dev-java | |
| parent | Bug #344167 - Remove unused bash-completion-install.diff. (diff) | |
| download | historical-13c35427d4a6d1838078a255f4d7bcf9206e1000.tar.gz historical-13c35427d4a6d1838078a255f4d7bcf9206e1000.tar.bz2 historical-13c35427d4a6d1838078a255f4d7bcf9206e1000.zip | |
Fix libjpeg depend to accept libjpeg-turbo >= 1.0.90 wrt #327487.
Package-Manager: portage-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/Manifest | 14 | ||||
| -rw-r--r-- | dev-java/icedtea6-bin/icedtea6-bin-1.9.1.ebuild | 4 |
3 files changed, 9 insertions, 15 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/Manifest b/dev-java/icedtea6-bin/Manifest index 90bf39a6e6b9..117e51dc7a9b 100644 --- a/dev-java/icedtea6-bin/Manifest +++ b/dev-java/icedtea6-bin/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX icedtea6-bin.env 947 RMD160 8f72b884c823f408755a3b06daea5af7705da488 SHA1 7473e4d987d5b0e9f1dbf48fbf4978e37d2f64b9 SHA256 b0f675b427f42d7fd1bbf1314523144a2bfc9f5ad44f89568adce120929f74e3 DIST icedtea6-bin-core-1.8.1-amd64.tar.bz2 35467633 RMD160 d1f302dd12c85de550cb62202096ed4ccc41bd7c SHA1 590cf19c4907f57c7d0df0ed3b31d6d3d5c2527f SHA256 78785bfe0a73d52e8b880ecd18082627c4442ca81aa0181a4f60f88b7842ad2b DIST icedtea6-bin-core-1.8.1-r1-amd64.tar.bz2 35470548 RMD160 350df67fc214d1840b9c3620033736435e3e1820 SHA1 0f5845eddcdadbbd51f891c1a8cc228c681cfd9a SHA256 6230abfb97eb7fad1e326aaaf6d99a1ede36eac2698e9b2f58b4c81548182a94 @@ -36,14 +33,7 @@ DIST icedtea6-bin-src-1.9.1.tar.bz2 26846492 RMD160 7eb8151445c1fc5826ece07d7999 DIST icedtea6-bin-src-1.9.tar.bz2 26848255 RMD160 28327c13a6dfa3fa9f5946ef8065c66b34fa6820 SHA1 79c740e39deb82aeb0a8a00233aab6a03937f900 SHA256 3914f2cc967887c400a2fa11ba0b64b053eb24d14f6ee298613410ff8511aee4 EBUILD icedtea6-bin-1.8.1-r1.ebuild 2693 RMD160 3cccf6b4b7bedc491ceaa38ed4a4b9102c3ca9c5 SHA1 48a40d897bc5f8155746bc657f586ccc4a9c56fb SHA256 5bc46e546d27eaaa2df448f9336709ac2087de3efe626778ef31b4d26131a174 EBUILD icedtea6-bin-1.8.1.ebuild 2694 RMD160 a59540adacfd9c64ddebc978e89a3e5f4381208b SHA1 bfa36c51e9094c9c89aecbf511ac3302ac1fec05 SHA256 40721139b0e74813a00548fa88db89f568375ace62d362807f4bf7faca3fa844 -EBUILD icedtea6-bin-1.9.1.ebuild 2690 RMD160 1b3d50e87dad504a7d7f1f69c977d3673ba08575 SHA1 06809d1fbada2eb4d0bc5f6d5a9159bfb70e8ae0 SHA256 13874290955a974392938fad3c49e85533e125f73faf075ba475e6e986584199 +EBUILD icedtea6-bin-1.9.1.ebuild 2732 RMD160 05b7644097683b34b2c52d2691f4fa06ee0af7ae SHA1 77e7df7a20bcfba0bd57aada83eedb267f34a60e SHA256 9e718caa8c72c953e256c59ccf6d460b8cdd7a78c8e9a8cc7d435f10f9203961 EBUILD icedtea6-bin-1.9.ebuild 2690 RMD160 cad58ef788f4570c6e3c1217d7c28788533e1462 SHA1 ffd6c74b06a8fa276469c751cb570c21a9bb6ee6 SHA256 29dc8aeaaa63fa985cc1f646ac758b4bfa2d21c66c0576f1c338e549386e7931 -MISC ChangeLog 6724 RMD160 f1685c2da5b73762338386a3461dea77be93efca SHA1 ecc84ca73f72ad37ab90228b5785535117a18f6b SHA256 113761046edcc38a32940d944c87702494abac21c58568109885a9d60c86d010 +MISC ChangeLog 6877 RMD160 174d6034e219aa589a5fc10280b95498d0450b6d SHA1 28440c1ae7d6e42378046827573a2f36ef58bb48 SHA256 e9b042b2443887de1d2e2ecabd0d4305e18170c4870cd70601eebfa6d1f8689a MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAky2ACYACgkQ9/cejkQaxBB9iwCfYCwFjxndudL5cBrnirLg8WKA -sKMAoIA1OQsJjITpTjqgffydStEmP8aw -=YGRt ------END PGP SIGNATURE----- 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 ) |