Transfer prefix keywords, bump EAPI

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 34 insertions, 18 deletions

diff --git a/dev-util/pmk/ChangeLog b/dev-util/pmk/ChangeLog
index 67f653b152bd..304e977f1cec 100644
--- a/dev-util/pmk/ChangeLog
+++ b/dev-util/pmk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/pmk
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/ChangeLog,v 1.12 2008/09/25 14:29:10 hawking Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/ChangeLog,v 1.13 2010/02/21 01:38:17 abcd Exp $
+
+  21 Feb 2010; Jonathan Callen <abcd@gentoo.org> pmk-0.10.4.ebuild:
+  Transfer prefix keywords, bump EAPI
 
 *pmk-0.10.4 (25 Sep 2008)
 
diff --git a/dev-util/pmk/Manifest b/dev-util/pmk/Manifest
index 52f1d69e4d95..98ca5d5b8f48 100644
--- a/dev-util/pmk/Manifest
+++ b/dev-util/pmk/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pmk-0.10.4.tar.gz 208475 RMD160 ea93ac1f71404cf7e42a6659f299d458c54aad6f SHA1 0c3392226a89aac264afda0252d0e0a719c85564 SHA256 bde39a1fb1f0612446838f4845f44f1a0a2adb9c62c2d0f9e3ca58c61888a569
-EBUILD pmk-0.10.4.ebuild 1406 RMD160 10d453ad121c6be850e4bcebe9306ed5e1f05a46 SHA1 49f8e6852cc455bca75cd1c722a1cacc11638787 SHA256 cb6088cb43d603be1ebda0b88598706b803664251a95bba08e7f373232672eee
-MISC ChangeLog 1813 RMD160 d7d83286a0b881f413a4c5ed93435f131c7bf28d SHA1 c3a923f73a03fe09f34fa69845a3900f67d1f32e SHA256 bd27bd3ba4e861b38fc0966f40d61435f5f0960a804b73dabe9a29c5f1a96368
+EBUILD pmk-0.10.4.ebuild 1518 RMD160 9b2b9eb2f451a1f8537a1056490346f3b45a061e SHA1 e27394d0d7727675dd5c15b5c2a7bdc554e994eb SHA256 9fe202902c4123aee1eaabc18a3db4a3b7440ef895c7f9b8a355837a6b329265
+MISC ChangeLog 1917 RMD160 8f612ff7914343d9b38d8f4fbed500bff4b86a2b SHA1 41895e865905dd4f4c18c10480d45251866baf31 SHA256 0afd0fc7fffa4c294793e082a85a94c771dd921fbb6e59aec36566f76b2baa08
 MISC metadata.xml 451 RMD160 8cfe671099ad042273143a1423f50ed2ecc71fb2 SHA1 feeb124105882b7729f915f4cac5cdb8b8e08dba SHA256 34bbf3e47f00bc01c702693606e2e922f7497522b4cb6cd69f800a74fdc8e9f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuAjo8ACgkQOypDUo0oQOruXwCfQx3VTQc/oItN1xoL6/tGtIfj
+1tUAn2PyjpN3afsK333Nx9FbpF5/W9rA
+=4wlT
+-----END PGP SIGNATURE-----
diff --git a/dev-util/pmk/pmk-0.10.4.ebuild b/dev-util/pmk/pmk-0.10.4.ebuild
index 07efb778c8c4..4e2d43198b1f 100644
--- a/dev-util/pmk/pmk-0.10.4.ebuild
+++ b/dev-util/pmk/pmk-0.10.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/pmk-0.10.4.ebuild,v 1.1 2008/09/25 14:29:10 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/pmk-0.10.4.ebuild,v 1.2 2010/02/21 01:38:17 abcd Exp $
+
+EAPI=3
 
 inherit toolchain-funcs
 
@@ -10,13 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=""
 RDEPEND=""
 
-src_unpack() {
+src_prepare() {
 	unpack ${A}
 	cd "${S}"
 
@@ -29,29 +31,30 @@ src_unpack() {
 EOF
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC CPP AS
-	./pmkcfg.sh -p /usr || die "Config failed"
-	emake || die "Build failed"
+	export SYSCONFDIR="${EPREFIX}"/etc
+	export PREFIX="${EPREFIX}"/usr
+	./pmkcfg.sh autodetected || die "Config failed"
 }
 
 src_install () {
-	make DESTDIR="${D}" MANDIR=/usr/share/man install || die "make failed"
+	emake -j1 DESTDIR="${D}" MANDIR="${EPREFIX}/usr/share/man" install || die "make failed"
 
 	dodoc BUGS Changelog README STATUS TODO || die "dodoc failed"
 }
 
 pkg_postinst() {
-	if [[ ! -f "${ROOT}"/etc/pmk/pmk.conf ]] ; then
+	if [[ ! -f ${EROOT}etc/pmk/pmk.conf ]] ; then
 		einfo
-		einfo "${ROOT}etc/pmk/pmk.conf doesn't exist."
+		einfo "${EROOT}etc/pmk/pmk.conf doesn't exist."
 		einfo "Running pmksetup to generate an initial pmk.conf."
 		einfo
 		# create one with initial values
-		"${ROOT}"/usr/bin/pmksetup
-		# run it again to reset PREFIX from /usr/local to /usr
-		"${ROOT}"/usr/bin/pmksetup -u PREFIX=\"/usr\"
+		"${EROOT}"usr/bin/pmksetup
+		# run it again to reset PREFIX from /usr/local to ${EPREFIX}/usr
+		"${EROOT}"usr/bin/pmksetup -u "PREFIX=\"${EPREFIX}/usr\""
 		# remove the automatically created backup from the extra run
-		rm -f "${ROOT}"/etc/pmk/pmk.conf.bak
+		rm -f "${EROOT}"etc/pmk/pmk.conf.bak
 	fi
 }