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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 14 insertions, 7 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/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
 }