Migrate Gentoo Prefix changes as tested in the Gentoo Prefix overlay. Add keywords, eprefixify update script. Approved by ssuominen.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 17 insertions, 20 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index b27c06afc866..b3ac8b719a2d 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,11 @@
 # 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.267 2010/06/30 14:43:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.268 2010/06/30 17:12:15 darkside Exp $
+
+  30 Jun 2010; Jeremy Olexa <darkside@gentoo.org> libpng-1.4.3.ebuild,
+  files/libpng-1.4.x-update.sh:
+  Migrate Gentoo Prefix changes as tested in the Gentoo Prefix overlay. Add
+  keywords, eprefixify update script. Approved by ssuominen.
 
   30 Jun 2010; Christian Faulhammer <fauli@gentoo.org> libpng-1.4.3.ebuild:
   stable x86, security bug 324153
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index f738b61859ac..66cab525e882 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX libpng-1.4.x-update.sh 377 RMD160 4c8a49afbf78f551a24c6cc0c262bce06876ea8f SHA1 896fdb1d858a1feaef8a3d19497bd1f7bb758fac SHA256 0ad63911f71c2b7f33eaebf563d91db6e96f2fb645c25aa023650625b1bf55c2
+AUX libpng-1.4.x-update.sh 403 RMD160 a043adce402d23092ec883015980b2dca37c0e5a SHA1 83929c00a616fa900aefc440cdbc462173f1a0c1 SHA256 d115fe0f98e667beca04d2f75c612ecf9bc6f651f9ff0d7805124bfd3cb83464
 DIST libpng-1.2.43.tar.xz 538832 RMD160 18e56239433f21263b90a93c6ddb941a75a3a544 SHA1 c7013d773eb45b8ed6a864e419e544106a0dd95d SHA256 d634da73842dfd734811de9247403b0aeb16d292d58be2f04abb5c31b54b607a
 DIST libpng-1.2.44.tar.xz 540480 RMD160 be002467e8b32b33fd2bfff6bf69c6228c91c241 SHA1 08a7760264a7cb5463a21ca122eacd2ee91b7e09 SHA256 b1ed29bb652cfc6ef63e7c31d0fabab7dfe79e009b145bab8bb906a8c1bd4751
 DIST libpng-1.4.3.tar.xz 539048 RMD160 4e1d845fd32d5724f10579093fb08c20a060ddab SHA1 f36caa966f3e47d6a3db0c95cab67049a5077ef2 SHA256 3728f11d9b0b9943d855f558f3ee2334af50cc9197a9218825787a303b5037d3
 EBUILD libpng-1.2.43-r2.ebuild 691 RMD160 520fb539cd9e4e49857b623036ecef00573a040f SHA1 baa6b78a32ff844f41376dbb263f708239342bcd SHA256 74814e43b2b538d302744806260398fc817f37056c19e55ccd4e442ec1b1f36e
 EBUILD libpng-1.2.44.ebuild 1012 RMD160 de052e6d89876609217bef5fe1d05f570803b99e SHA1 255a2f91c90473db55d575ad421da7db526568b2 SHA256 feace10f1799bb4b7d56779920f5834f8565fbce464f12e42d1e2b15c4c2fe5b
-EBUILD libpng-1.4.3.ebuild 999 RMD160 c8fe9f0c5dab8e8498704e9feb168785c847c26b SHA1 9f25e345fc95494269ebc871a138184877d0e8a9 SHA256 30cd7fbd87c5a3d90fc0e4e8ebaed733378eba0e51149c2556be261b06294621
-MISC ChangeLog 35680 RMD160 ed73e505d4c8b49f773d9ede80d91592492fd1f3 SHA1 000e8930be74709df8b6e2bb314d411f3007596c SHA256 93e1589d54f6f707f032dbc2ae3a4f4270b4c7df4ec4a9d3d3291eb2ebe5b5d3
+EBUILD libpng-1.4.3.ebuild 1267 RMD160 a4770c4e7cf56eaedfffdff5eee357b3bd5167e4 SHA1 30227ea55ccad13f73a3e1f103f6a2384add2e73 SHA256 61c449e4d9bdc554d03a0db7d93267fa03cab8e5623d8ef688ec7d00aa30947e
+MISC ChangeLog 35924 RMD160 be58a9fee58d6bf505c78a0241f3ca09f5021db8 SHA1 cf3aa90ae632972e26c80847c226439db85812a8 SHA256 3fa0a0824539e5ce99ec94313417abc89b0481e751e0964da8d7971c514ebde8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwrWG8ACgkQNQqtfCuFneMzfgCgnTNaZOvnv8NgkctWrDO+rzQM
-PqoAoILaby08GP4cClvCSHSRUzj8QmH+
-=cbYb
------END PGP SIGNATURE-----
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 bdf54cb47710..120fb87f58a5 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
 
-. /etc/init.d/functions.sh
+. "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh"
 
 if ! type -p qfile >/dev/null; then
 	einfo "Please install app-portage/portage-utils."
diff --git a/media-libs/libpng/libpng-1.4.3.ebuild b/media-libs/libpng/libpng-1.4.3.ebuild
index 9045ee56503d..14a16375fafc 100644
--- a/media-libs/libpng/libpng-1.4.3.ebuild
+++ b/media-libs/libpng/libpng-1.4.3.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.3.ebuild,v 1.5 2010/06/30 14:43:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.3.ebuild,v 1.6 2010/06/30 17:12:15 darkside Exp $
 
 EAPI=3
-inherit eutils libtool multilib
+inherit eutils libtool multilib prefix
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="as-is"
 SLOT="0"
-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 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
@@ -19,13 +19,15 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 src_prepare() {
+	cp "${FILESDIR}"/libpng-1.4.x-update.sh "${T}"
+	eprefixify "${T}"/libpng-1.4.x-update.sh
 	elibtoolize
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc ANNOUNCE CHANGES README TODO
-	dosbin "${FILESDIR}"/libpng-1.4.x-update.sh
+	dosbin "${T}"/libpng-1.4.x-update.sh
 }
 
 pkg_preinst() {
@@ -34,7 +36,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	elog
-	elog "Run /usr/sbin/libpng-1.4.x-update.sh to fix libtool archives (.la)"
+	elog "Run ${EPREFIX}/usr/sbin/libpng-1.4.x-update.sh to fix libtool archives (.la)"
 	elog
 	preserve_old_lib_notify /usr/$(get_libdir)/libpng12.so.0
 }