diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-10 06:02:07 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-10 06:02:07 +0000 |
| commit | 5695832b22dc876944037a22f9895ab6c85e9f49 (patch) | |
| tree | fae7799e57fd2332b749f1c05572e757927e2ab9 /media-libs | |
| parent | New package, dep to PEAK-Rules, ebuild written by me (diff) | |
| download | gentoo-2-5695832b22dc876944037a22f9895ab6c85e9f49.tar.gz gentoo-2-5695832b22dc876944037a22f9895ab6c85e9f49.tar.bz2 gentoo-2-5695832b22dc876944037a22f9895ab6c85e9f49.zip | |
Prevent file collision with libpng15.so.15 which can be part of the libpng16 package by preserve_old_lib wrt #465346
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libpng/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libpng/libpng-1.5.15-r15.ebuild | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog index 2bee6a4f254a..e57f087e979b 100644 --- a/media-libs/libpng/ChangeLog +++ b/media-libs/libpng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libpng # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.391 2013/04/09 20:13:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.392 2013/04/10 06:02:07 ssuominen Exp $ + + 10 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> libpng-1.5.15-r15.ebuild: + Prevent file collision with libpng15.so.15 which can be part of the libpng16 + package by preserve_old_lib wrt #465346 *libpng-1.5.15-r15 (09 Apr 2013) diff --git a/media-libs/libpng/libpng-1.5.15-r15.ebuild b/media-libs/libpng/libpng-1.5.15-r15.ebuild index 1edcd4756337..38adbd23a398 100644 --- a/media-libs/libpng/libpng-1.5.15-r15.ebuild +++ b/media-libs/libpng/libpng-1.5.15-r15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.15-r15.ebuild,v 1.1 2013/04/09 20:13:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.15-r15.ebuild,v 1.2 2013/04/10 06:02:07 ssuominen Exp $ # this ebuild is only for the libpng15.so.15 SONAME for ABI compat @@ -23,6 +23,11 @@ RDEPEND="sys-libs/zlib:= DEPEND="${RDEPEND} app-arch/xz-utils" +pkg_setup() { + local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15 + [[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}" +} + src_prepare() { if use apng; then epatch "${WORKDIR}"/${PN}-*-apng.patch |