From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 13 May 2010 20:05:18 +0000 (+0000)
Subject: Rename revision to get slotted version preferred first wrt #319457 by Vadim Kuznetsov.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7e4dfa1871959c0f7b475bf5a9ecd7ab9b10591;p=gentoo.git

Rename revision to get slotted version preferred first wrt #319457 by Vadim Kuznetsov.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index d679cefe288f..80cbe8180d5a 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,13 @@
 # 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.258 2010/05/12 18:28:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.259 2010/05/13 20:05:17 ssuominen Exp $
+
+*libpng-1.2.43-r3 (13 May 2010)
+
+  13 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -libpng-1.2.43-r1.ebuild, +libpng-1.2.43-r3.ebuild:
+  Rename revision to get slotted version preferred first wrt #319457 by
+  Vadim Kuznetsov.
 
   12 May 2010; Raúl Porcel <armin76@gentoo.org> libpng-1.2.43-r1.ebuild,
   libpng-1.2.43-r2.ebuild:
@@ -18,7 +25,7 @@
 
   10 May 2010; Samuli Suominen <ssuominen@gentoo.org> libpng-1.4.2.ebuild,
   +files/libpng-1.4.x-update.sh:
-  Install rude libpng-1.4.x-update.sh which can be improved.
+  Install libpng-1.4.x-update.sh which will rename libpng12 with libpng14 in .la files.
 
   10 May 2010; Brent Baude <ranger@gentoo.org> libpng-1.2.43-r2.ebuild:
   Marking libpng-1.2.43-r2 ppc64 for bug 307637
@@ -30,13 +37,13 @@
   09 May 2010; Samuli Suominen <ssuominen@gentoo.org> libpng-1.2.40.ebuild,
   -libpng-1.2.42.ebuild, -libpng-1.2.43.ebuild, +libpng-1.2.43-r1.ebuild,
   +libpng-1.2.43-r2.ebuild, -libpng-1.4.2_rc5.ebuild, +libpng-1.4.2.ebuild:
-  Version bump to final 1.4.2 and release it into arch wrt #305095.
+  Version bump to final 1.4.2 and release it into ~arch wrt #305095.
 
 *libpng-1.4.2_rc5 (03 May 2010)
 
   03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   +libpng-1.4.2_rc5.ebuild:
-  Replace 1.4.1 with 1.4.2_rc5 which should fix problems with xfig,
+  Replace 1.4.1 with 1.4.2_rc5 which will fix problems with xfig,
   transfig, and timidity++ by restoring a function.
 
 *libpng-1.2.43 (06 Mar 2010)
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index dd23fa84f36a..536220e0e2d8 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,8 +1,8 @@
-AUX libpng-1.4.x-update.sh 475 RMD160 09f3d29a73db2f1d8bdce59b620a8792ed35c7f3 SHA1 e7e5a82eb6b1204cc7d63bc4b4d146c632c953a0 SHA256 9edb28eb7309ded60ade7e14a01c104fc80627181638696762ebc9e9b3efe253
+AUX libpng-1.4.x-update.sh 460 RMD160 7c65ff777394cc2d8e17cb928d63a8ead5a0498b SHA1 516992aeec7140285670ffec310d394351f304bc SHA256 d7005d2ba8829edd2da1ddde54d2c645e61d3360d4005d562d04a616c197d444
 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.43-r1.ebuild 1043 RMD160 5979afb89cd91f0b37773e12d74e4dbd844c0e8a SHA1 aa4c91fccd59a6fbbea1f9383bee83a1bfeb249e SHA256 66e48f90551b61deed2e1a3b5783c140e0bc83051f98c386a5f5a67b2a476faa
-EBUILD libpng-1.2.43-r2.ebuild 695 RMD160 79c45ed837723463aa1bc304afbe5b1680da5515 SHA1 979ca3d0452d88e66460ded9d639438a32f04a8f SHA256 05b819db4d1946a6c8f86f30fd2aec0fb74b830a32fa1fb597c844473e765324
-EBUILD libpng-1.4.2.ebuild 1163 RMD160 fef99f33edb98776a76f1890135fcf03294ff360 SHA1 c0dfccf1bc917217275e9303f0a2c89c43cde7ce SHA256 40d2fc8aa3646d3816d71d6ae70cb86303f995e50de44a8a5965a0970573ce80
-MISC ChangeLog 34359 RMD160 254f3bd373f79157f0e86d7bb9dcc1a7c0030c93 SHA1 6ff3bbaa140d18b5508f05216b9cf1e53ef30f83 SHA256 fac81390281886420eded61c11d52f8873463a22f7332c2e367016c2370fbfb1
+EBUILD libpng-1.2.43-r2.ebuild 722 RMD160 485feff086d6660ed3606a425c10920b2fd8b9be SHA1 62b5322ac426ff4860f433f378f2d85073ea2b3d SHA256 53f4b20d5fb91ca658e72e714ff6dc1d02e01632593490b148aa4c151677cc27
+EBUILD libpng-1.2.43-r3.ebuild 1045 RMD160 ea369fdc74e0cc8eaf50462c18e8b267db77618d SHA1 11caaa88d98a4e3961d1b192373ffa9688de5a33 SHA256 b1e73fe2b8c2bf945e3d147858b541ad00633a420837d12f8280f2c271a9c4aa
+EBUILD libpng-1.4.2.ebuild 1148 RMD160 89add6e5a82fd04ac2defb0264ed3cc425f1765a SHA1 49ceecedcd2ba857eec820d7cb6a2ac5d32cd14f SHA256 796a55050f7d852cbe2033833e29c2911a13379e3f63c106f480daed4c958c66
+MISC ChangeLog 34620 RMD160 964c732d3de3cb72414475e04f45abbb37484d8a SHA1 67b7f167df0dc75969f7ada4702b5d841b272823 SHA256 46c42256e1bdaa5379cd15c643f127c73bfdfba0b755ca7d651b840a5bdd968d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/media-libs/libpng/files/libpng-1.4.x-update.sh b/media-libs/libpng/files/libpng-1.4.x-update.sh
index 2cd7e139bb8e..8b0a695528d3 100644
--- a/media-libs/libpng/files/libpng-1.4.x-update.sh
+++ b/media-libs/libpng/files/libpng-1.4.x-update.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Try revdep-rebuild or lafilefixer first."
+echo "Try revdep-rebuild first."
 echo "This script will rename -lpng12 and libpng12.la to -lpng14 and libpng14.la"
 echo "in your system libdir libtool .la files without asking permission."
 
diff --git a/media-libs/libpng/libpng-1.2.43-r2.ebuild b/media-libs/libpng/libpng-1.2.43-r2.ebuild
index fbf69b4da997..acb92e8f05b7 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.9 2010/05/12 18:28:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.43-r2.ebuild,v 1.10 2010/05/13 20:05:17 ssuominen Exp $
 
 EAPI=3
 inherit libtool
@@ -15,7 +15,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~spar
 IUSE=""
 
 RDEPEND="sys-libs/zlib
-	!<media-libs/libpng-1.2.43-r2"
+	!<media-libs/libpng-1.2.43-r2
+	!media-libs/libpng:1.2"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
diff --git a/media-libs/libpng/libpng-1.2.43-r1.ebuild b/media-libs/libpng/libpng-1.2.43-r3.ebuild
similarity index 81%
rename from media-libs/libpng/libpng-1.2.43-r1.ebuild
rename to media-libs/libpng/libpng-1.2.43-r3.ebuild
index 1169c4296639..a6b8e8d4c585 100644
--- a/media-libs/libpng/libpng-1.2.43-r1.ebuild
+++ b/media-libs/libpng/libpng-1.2.43-r3.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.5 2010/05/12 18:39:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.43-r3.ebuild,v 1.1 2010/05/13 20:05:17 ssuominen Exp $
 
 # this ebuild is only for the libpng12.so.0 SONAME for ABI compat
 
@@ -13,11 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="as-is"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
-	!<media-libs/libpng-1.2.43-r1"
+	!<media-libs/libpng-1.2.43-r3"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
diff --git a/media-libs/libpng/libpng-1.4.2.ebuild b/media-libs/libpng/libpng-1.4.2.ebuild
index 94a31e675f08..e7a37f5f00ae 100644
--- a/media-libs/libpng/libpng-1.4.2.ebuild
+++ b/media-libs/libpng/libpng-1.4.2.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.4.2.ebuild,v 1.3 2010/05/11 10:46:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.2.ebuild,v 1.4 2010/05/13 20:05:17 ssuominen Exp $
 
 EAPI=3
 inherit libtool
@@ -35,7 +35,7 @@ pkg_postinst() {
 	ewarn "files."
 	echo
 	elog "Run /usr/sbin/libpng-1.4.x-update.sh at your own risk only if"
-	elog "revdep-rebuild or lafilefixer fails."
+	elog "revdep-rebuild fails."
 	echo
 	elog "Don't forget \"man emerge\" and useful parameters like --skip-first,"
 	elog "--resume and --keep-going."