diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-09-23 04:27:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-09-23 04:27:08 +0000 |
| commit | edff8c1b1d3f3a3aaed60ea25416da8badaec9e5 (patch) | |
| tree | 260f903bd98ddc8e8b25a362bfd358beb185ca91 /media-libs/jpeg | |
| parent | Add a live version for testing upstream changes on new hardware. (diff) | |
| download | historical-edff8c1b1d3f3a3aaed60ea25416da8badaec9e5.tar.gz historical-edff8c1b1d3f3a3aaed60ea25416da8badaec9e5.tar.bz2 historical-edff8c1b1d3f3a3aaed60ea25416da8badaec9e5.zip | |
Add preserve_old_lib handling for libjpeg.so.62 if needed #285598.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'media-libs/jpeg')
| -rw-r--r-- | media-libs/jpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/jpeg/Manifest | 14 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-7.ebuild | 12 |
3 files changed, 16 insertions, 15 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog index 4a0732f9fd6c..66a9322569a3 100644 --- a/media-libs/jpeg/ChangeLog +++ b/media-libs/jpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/jpeg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.76 2009/09/20 12:08:47 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.77 2009/09/23 04:27:08 vapier Exp $ + + 23 Sep 2009; Mike Frysinger <vapier@gentoo.org> jpeg-7.ebuild: + Add preserve_old_lib handling for libjpeg.so.62 if needed #285598. 20 Sep 2009; Alexis Ballier <aballier@gentoo.org> jpeg-7.ebuild, -files/Makefile.extra: diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest index bc16ebc08e24..465c7c3e5b2c 100644 --- a/media-libs/jpeg/Manifest +++ b/media-libs/jpeg/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX Makefile.in.extra 814 RMD160 f8cc72b3c7eceb5cfb3413d6f70b37a45794081b SHA1 aa15a6662862b6e4459b44d98957011f491e8ac3 SHA256 067806da66421b303a155243bd80d729a10ca3f15182490fef3e55fc17ad9cf4 AUX jpeg-7-maxmem_sysconf.patch 1313 RMD160 5c6821fc4150b95e67e61bbf330362d938e58d46 SHA1 0b9b6741e58e2964a15a520aa23ab23534d6e92d SHA256 92d08b14ade2f42291d3de8074f5e4f9dd3c64dd9ec227bc770a0825187202de DIST jpeg-6b-patches-1.6.tar.bz2 22573 RMD160 21290e71c116d8e543737ffd5e26b96f34e30f93 SHA1 b66629ad0380a318442be5b5b4ba945bf98035ff SHA256 23a07581f336a1e8c33f0efdb4b3ef728fe278459811b3b89258f8525dbbbcca @@ -8,13 +5,6 @@ DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 S DIST jpegsrc.v7.tar.gz 960379 RMD160 6049c5fee2682c0757d4b51740abd981d1b24487 SHA1 88cced0fc3dbdbc82115e1d08abce4e9d23a4b47 SHA256 50b7866206c5be044c4a2b0d7895898f5a58d31b50e16e79cf7dea3b90337ebf DIST libjpeg7_7-1.diff.gz 11554 RMD160 193bcb5fdc7360707cbb450c16888499085dd2c6 SHA1 b346d8f7803d08feccade84a0012a48ee2b5f62e SHA256 e465ab295502c6db995780d3b2e38570794d0d31034f0065352bcbda63c3a094 EBUILD jpeg-6b-r8.ebuild 1403 RMD160 4afdc4d2075bbc36b9c49e85618306cf0137e771 SHA1 c261e925d768138cd2b38cf75edae27476ab089a SHA256 f3da0a22522d50207fcc751f0560bae1a75a570fdb99818dc5a9b6642af10277 -EBUILD jpeg-7.ebuild 1310 RMD160 6b6f089154b799d80f17b409bece0c9db0b0aad7 SHA1 b2063715c8e4bb438d8c75f40d486a7f0af762c0 SHA256 580b09ed787173c5f4f687ff0c9f1b5c227b846952191ab5f4e28701e207aa7f -MISC ChangeLog 9655 RMD160 8425fda5e14676d07a20c31039c9dea9dd2ea619 SHA1 ff0cc424b48dd3e3939c007fa3346bc3a95bb912 SHA256 82535058227c418e69a7ad56552d0af53c0f23f522a7c865ff2c8f674eaf7f0b +EBUILD jpeg-7.ebuild 1541 RMD160 2ddc9377c368ad66ab295e4d45246f9b3f8aa500 SHA1 f23d61ac256461f3c8f7e87bb2d35a4f634cade7 SHA256 73cbea410e4ee919bd072cdb206248b961f968d22a626a58b1faa7d505e803f6 +MISC ChangeLog 9788 RMD160 7ccd409d701be926fca1eca4321d76bd473304cb SHA1 ecdc7f1b275190bd78bd3d1d93d954e5a7c25e2a SHA256 547ab5ecd50273798d3510c6a0395ded101240d000b0ac900839deebd87b9273 MISC metadata.xml 224 RMD160 3a7dcbadaed2b7ed12e11152fe1fe2de0193fc29 SHA1 fa5078079869e963f3f51f80124cecf8ea6c1b67 SHA256 806818bba7ae36d62f16c1fe548a1eb2a360caf2d984aa8f47bba7b91ff73434 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkq2G1QACgkQvFcC4BYPU0rmJwCaApC/dVwIjjzlTbpo2Ke5nAGQ -qWAAoMIqkGa7PVPcbK6v3i9QjIqXhvIK -=5OPK ------END PGP SIGNATURE----- diff --git a/media-libs/jpeg/jpeg-7.ebuild b/media-libs/jpeg/jpeg-7.ebuild index c398ad8ede52..1dbdbc9dfa49 100644 --- a/media-libs/jpeg/jpeg-7.ebuild +++ b/media-libs/jpeg/jpeg-7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v 1.8 2009/09/20 12:08:47 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v 1.9 2009/09/23 04:27:08 vapier Exp $ EAPI="2" @@ -8,7 +8,7 @@ DEB_PV="7-1" DEB_PN="libjpeg${PV}" DEB="${DEB_PN}_${DEB_PV}" -inherit eutils libtool +inherit eutils libtool multilib DESCRIPTION="Library to load, handle and manipulate images in the JPEG format" HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/" @@ -46,3 +46,11 @@ src_install() { emake DESTDIR="${D}" install || die dodoc change.log example.c README *.txt } + +pkg_preinst() { + has_version media-libs/jpeg-compat || preserve_old_lib /usr/$(get_libdir)/libjpeg.so.62 +} + +pkg_postinst() { + has_version media-libs/jpeg-compat || preserve_old_lib_notify /usr/$(get_libdir)/libjpeg.so.62 +} |