Use get_libname to get correct shared lib depending on the platform

(Portage version: 2.2.01.17901-prefix/cvs/Darwin powerpc)

4 files changed, 14 insertions, 10 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 530ee3c36880..44ef347e9d7d 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.281 2011/02/12 23:22:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.282 2011/02/13 08:52:18 grobian Exp $
+
+  13 Feb 2011; Fabian Groffen <grobian@gentoo.org> libpng-1.2.44.ebuild,
+  libpng-1.4.5.ebuild, libpng-1.5.1.ebuild:
+  Use get_libname to get correct shared lib depending on the platform
 
   12 Feb 2011; Mike Frysinger <vapier@gentoo.org> libpng-1.2.44.ebuild:
   Clean up a bit and only compile the stuff we will actually install.
diff --git a/media-libs/libpng/libpng-1.2.44.ebuild b/media-libs/libpng/libpng-1.2.44.ebuild
index 6a823e7b1445..ccf8c3da62fc 100644
--- a/media-libs/libpng/libpng-1.2.44.ebuild
+++ b/media-libs/libpng/libpng-1.2.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.44.ebuild,v 1.7 2011/02/12 23:22:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.44.ebuild,v 1.8 2011/02/13 08:52:18 grobian Exp $
 
 # this ebuild is only for the libpng12.so.0 SONAME for ABI compat
 
@@ -23,8 +23,8 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 pkg_setup() {
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libpng12.so.0 ]] ; then
-		rm -f "${ROOT}"/usr/$(get_libdir)/libpng12.so.0
+	if [[ -e ${EROOT}/usr/$(get_libdir)/libpng12.so.0 ]] ; then
+		rm -f "${EROOT}"/usr/$(get_libdir)/libpng12.so.0
 	fi
 }
 
diff --git a/media-libs/libpng/libpng-1.4.5.ebuild b/media-libs/libpng/libpng-1.4.5.ebuild
index f98432b0dc20..cffd028c6b5c 100644
--- a/media-libs/libpng/libpng-1.4.5.ebuild
+++ b/media-libs/libpng/libpng-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.5.ebuild,v 1.6 2011/01/29 18:50:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.5.ebuild,v 1.7 2011/02/13 08:52:18 grobian Exp $
 
 EAPI="3"
 
@@ -36,10 +36,10 @@ src_install() {
 
 pkg_preinst() {
 	has_version ${CATEGORY}/${PN}:1.2 && return 0
-	preserve_old_lib /usr/$(get_libdir)/libpng12.so.0
+	preserve_old_lib /usr/$(get_libdir)/libpng12$(get_libname 0)
 }
 
 pkg_postinst() {
 	has_version ${CATEGORY}/${PN}:1.2 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/libpng12.so.0
+	preserve_old_lib_notify /usr/$(get_libdir)/libpng12$(get_libname 0)
 }
diff --git a/media-libs/libpng/libpng-1.5.1.ebuild b/media-libs/libpng/libpng-1.5.1.ebuild
index cf5211b7a423..9b2e73cc7b27 100644
--- a/media-libs/libpng/libpng-1.5.1.ebuild
+++ b/media-libs/libpng/libpng-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.1.ebuild,v 1.1 2011/02/11 14:59:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.1.ebuild,v 1.2 2011/02/13 08:52:18 grobian Exp $
 
 EAPI="3"
 
@@ -39,10 +39,10 @@ src_install() {
 
 pkg_preinst() {
 #	has_version ${CATEGORY}/${PN}:1.4 && return 0
-	preserve_old_lib /usr/$(get_libdir)/libpng14.so.0
+	preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 0)
 }
 
 pkg_postinst() {
 #	has_version ${CATEGORY}/${PN}:1.4 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/libpng14.so.0
+	preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 0)
 }