From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 11 May 2010 13:35:34 +0000 (+0000)
Subject: Fix mistakes
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26dee1e0c71739dfa299b1966c1544f6efea4c1d;p=gentoo.git

Fix mistakes
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 6f7fbba6d887..4765d6396ad2 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -3,8 +3,8 @@ DIST libpng-1.2.40.tar.bz2 629950 RMD160 1ba929e73493bfc81bc95113f69f0ff9c5f4781
 DIST libpng-1.2.43.tar.xz 538832 RMD160 18e56239433f21263b90a93c6ddb941a75a3a544 SHA1 c7013d773eb45b8ed6a864e419e544106a0dd95d SHA256 d634da73842dfd734811de9247403b0aeb16d292d58be2f04abb5c31b54b607a
 DIST libpng-1.4.2.tar.xz 527736 RMD160 3b813503b155cd9b00ba0a77f346bab8b0e82366 SHA1 d6a3ef20f5bb2c13f3d799bd23ffb9ee3dbc844f SHA256 a644469ab0620dcf19351b0739ea1ee6696feb4560b42575af7885a16dfef88e
 EBUILD libpng-1.2.40.ebuild 720 RMD160 ec46def9769d5547109572ec96d3e419c6150957 SHA1 9b0a842632972a42789126f05b58ba042f757036 SHA256 6f93265c301d87d443f36530cd3ca818a9103c9a3f65a69ccfa335fb150e2223
-EBUILD libpng-1.2.43-r1.ebuild 1037 RMD160 f2ed8f676292e18b1d1fb02fe6b8e296ff6909ce SHA1 90e8326bfcad5f3e27f9540c561e0b3b98146019 SHA256 cf64eeed1a269e838db56ac393f685d0bd747db20a25053963084ad88ac2bdf9
-EBUILD libpng-1.2.43-r2.ebuild 840 RMD160 da4758821f01f3e0277da67484b2d9964bb4e8d3 SHA1 92ac900d2dbd26c93df3e0636d2a51dbad4d638f SHA256 9cff79a1d8113ee0b3b531acf6c5ca58e0e01e0210b20d9f638231bd68d16d18
+EBUILD libpng-1.2.43-r1.ebuild 1042 RMD160 c2249c7062f3757f6f1a87289d7bded4b66dd6ee SHA1 af710e171108cb4aa7361cfa1fc99085afc5c734 SHA256 75cbd1076494b06f95e39c52252df2217b56ec51987d5999c2eb046ab1da5126
+EBUILD libpng-1.2.43-r2.ebuild 706 RMD160 207a420cca218a18e8cb09475c28b90062248af0 SHA1 7b43c8d75428644e3adee242b3e9caa10cfd87bd SHA256 78d124945d0ad495d803d4d46a46009d0a4d90fc52109ac060ef718ca1037c47
 EBUILD libpng-1.4.2.ebuild 1163 RMD160 fef99f33edb98776a76f1890135fcf03294ff360 SHA1 c0dfccf1bc917217275e9303f0a2c89c43cde7ce SHA256 40d2fc8aa3646d3816d71d6ae70cb86303f995e50de44a8a5965a0970573ce80
 MISC ChangeLog 34083 RMD160 e2619c69708dbeca4252c3c0b6d9e9fa248862b2 SHA1 64e06e9d050164ac774d74cf6b1bce7d3e2d3ef0 SHA256 e74b66e321394329f46e3c9d473d0ed2771ee9c24a3d3f21dfd2bcf3fb3a580e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/media-libs/libpng/libpng-1.2.43-r1.ebuild b/media-libs/libpng/libpng-1.2.43-r1.ebuild
index f19f715ee36b..aa931303a035 100644
--- a/media-libs/libpng/libpng-1.2.43-r1.ebuild
+++ b/media-libs/libpng/libpng-1.2.43-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.43-r1.ebuild,v 1.2 2010/05/10 19:41:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.43-r1.ebuild,v 1.3 2010/05/11 13:35:34 ssuominen Exp $
 
 # this ebuild is only for the libpng12.so SONAME for ABI compat
 
@@ -22,8 +22,8 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 pkg_setup() {
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libpng12.so.0.43.0 ]]; then
-		rm -f "${ROOT}"/usr/$(get_libdir)/libpng12.so.0.43.0
+	if [[ -e ${ROOT}/usr/$(get_libdir)/libpng12.so.0 ]]; then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libpng12.so.0
 	fi
 }
 
@@ -39,5 +39,5 @@ src_configure() {
 
 src_install() {
 	exeinto /usr/$(get_libdir)
-	doexe .libs/libpng12.so.0.43.0 || die
+	newexe .libs/libpng12.so.0.43.0 libpng12.so.0 || die
 }
diff --git a/media-libs/libpng/libpng-1.2.43-r2.ebuild b/media-libs/libpng/libpng-1.2.43-r2.ebuild
index cd9ea455223c..ecbc535f87a9 100644
--- a/media-libs/libpng/libpng-1.2.43-r2.ebuild
+++ b/media-libs/libpng/libpng-1.2.43-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.43-r2.ebuild,v 1.6 2010/05/10 20:36:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.43-r2.ebuild,v 1.7 2010/05/11 13:35:34 ssuominen Exp $
 
 EAPI=3
 inherit libtool
@@ -19,12 +19,6 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
-pkg_setup() {
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libpng12.so.0.43.0 ]]; then
-		rm -f "${ROOT}"/usr/$(get_libdir)/libpng12.so.0.43.0
-	fi
-}
-
 src_prepare() {
 	elibtoolize
 }