diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-09-23 04:29:04 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-09-23 04:29:04 +0000 |
| commit | 2c02b4d7787b70a739ac073e5baa1dc0c029a9b8 (patch) | |
| tree | 0e48777733b6d354707abacad19f4e7df18c500d /media-libs | |
| parent | Add preserve_old_lib handling for libjpeg.so.62 if needed #285598. (diff) | |
| download | historical-2c02b4d7787b70a739ac073e5baa1dc0c029a9b8.tar.gz historical-2c02b4d7787b70a739ac073e5baa1dc0c029a9b8.tar.bz2 historical-2c02b4d7787b70a739ac073e5baa1dc0c029a9b8.zip | |
Trim libjpeg.so.62 automatically if it is being preserved for media-libs/jpeg #285598.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/jpeg-compat/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/media-libs/jpeg-compat/ChangeLog b/media-libs/jpeg-compat/ChangeLog index a8345ee810dd..f626e5487464 100644 --- a/media-libs/jpeg-compat/ChangeLog +++ b/media-libs/jpeg-compat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/jpeg-compat # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-compat/ChangeLog,v 1.3 2009/09/16 19:02:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-compat/ChangeLog,v 1.4 2009/09/23 04:29:04 vapier Exp $ + + 23 Sep 2009; Mike Frysinger <vapier@gentoo.org> jpeg-compat-6b-r1.ebuild: + Trim libjpeg.so.62 automatically if it is being preserved for + media-libs/jpeg #285598. *jpeg-compat-6b-r1 (16 Sep 2009) diff --git a/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild b/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild index 2af5bc522168..aac450a2161b 100644 --- a/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild +++ b/media-libs/jpeg-compat/jpeg-compat-6b-r1.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-compat/jpeg-compat-6b-r1.ebuild,v 1.1 2009/09/16 19:02:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-compat/jpeg-compat-6b-r1.ebuild,v 1.2 2009/09/23 04:29:04 vapier Exp $ EAPI=2 inherit eutils libtool multilib toolchain-funcs @@ -24,6 +24,15 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P/-compat} +pkg_setup() { + if ! has_version media-libs/jpeg-compat ; then + if [[ -e ${ROOT}/usr/$(get_libdir)/libjpeg.so.62 ]] ; then + elog "Removing libjpeg.so.62 manually from media-libs/jpeg" + rm -f "${ROOT}/usr/$(get_libdir)/libjpeg.so.62" + fi + fi +} + src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch rm libtool-wrap |