diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-15 16:01:05 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-15 16:01:05 +0000 |
| commit | f797c412f5868eb9fd2f46807ac20053c689e6cd (patch) | |
| tree | e6f2a96decf26e9636e64b63443018324b6fef98 | |
| parent | Old. (diff) | |
| download | gentoo-2-f797c412f5868eb9fd2f46807ac20053c689e6cd.tar.gz gentoo-2-f797c412f5868eb9fd2f46807ac20053c689e6cd.tar.bz2 gentoo-2-f797c412f5868eb9fd2f46807ac20053c689e6cd.zip | |
Preserve libpng12.so.0 as part of #323649.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | media-libs/libpng/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/libpng/libpng-1.4.2.ebuild | 22 |
2 files changed, 14 insertions, 13 deletions
diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog index 8450f559e6aa..07b9cafe1bd3 100644 --- a/media-libs/libpng/ChangeLog +++ b/media-libs/libpng/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libpng # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.260 2010/05/16 18:25:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.261 2010/06/15 16:01:05 ssuominen Exp $ + + 15 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> libpng-1.4.2.ebuild: + Preserve libpng12.so.0 as part of #323649. 16 May 2010; Samuli Suominen <ssuominen@gentoo.org> files/libpng-1.4.x-update.sh: diff --git a/media-libs/libpng/libpng-1.4.2.ebuild b/media-libs/libpng/libpng-1.4.2.ebuild index e7a37f5f00ae..64375ed23d71 100644 --- a/media-libs/libpng/libpng-1.4.2.ebuild +++ b/media-libs/libpng/libpng-1.4.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.2.ebuild,v 1.4 2010/05/13 20:05:17 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.2.ebuild,v 1.5 2010/06/15 16:01:05 ssuominen Exp $ EAPI=3 -inherit libtool +inherit eutils libtool multilib DESCRIPTION="Portable Network Graphics library" HOMEPAGE="http://www.libpng.org/" @@ -25,19 +25,17 @@ src_prepare() { src_install() { emake DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES README TODO || die - dosbin "${FILESDIR}"/libpng-1.4.x-update.sh || die + dodoc ANNOUNCE CHANGES README TODO + dosbin "${FILESDIR}"/libpng-1.4.x-update.sh +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libpng12.so.0 } pkg_postinst() { echo - ewarn "Moving from libpng 1.2.x to 1.4.x will break installed libtool .la" - ewarn "files." - echo - elog "Run /usr/sbin/libpng-1.4.x-update.sh at your own risk only if" - elog "revdep-rebuild fails." - echo - elog "Don't forget \"man emerge\" and useful parameters like --skip-first," - elog "--resume and --keep-going." + elog "Run /usr/sbin/libpng-1.4.x-update.sh to fix libtool archives (.la)" echo + preserve_old_lib_notify /usr/$(get_libdir)/libpng12.so.0 } |