summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-09-23 04:27:08 +0000
committerMike Frysinger <vapier@gentoo.org>2009-09-23 04:27:08 +0000
commit5fd53524d8d016aef6fb4e750283b7183ba0afb1 (patch)
tree5f9085f53b547e372ae531eaa5eafdae956eaa36 /media-libs/jpeg
parentAdd a live version for testing upstream changes on new hardware. (diff)
downloadgentoo-2-5fd53524d8d016aef6fb4e750283b7183ba0afb1.tar.gz
gentoo-2-5fd53524d8d016aef6fb4e750283b7183ba0afb1.tar.bz2
gentoo-2-5fd53524d8d016aef6fb4e750283b7183ba0afb1.zip
Add preserve_old_lib handling for libjpeg.so.62 if needed #285598.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/jpeg')
-rw-r--r--media-libs/jpeg/ChangeLog5
-rw-r--r--media-libs/jpeg/jpeg-7.ebuild12
2 files changed, 14 insertions, 3 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/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
+}