Version bumped and added fix from bug #170983

Package-Manager: portage-2.1.2.2

diff --git a/dev-util/pmk/ChangeLog b/dev-util/pmk/ChangeLog
index 797e00fee751c87c78b2a1e687e8f2e95e145102..ce698fa68f2937206c0c93038ca9b16c06879231 100644 (file)
--- a/dev-util/pmk/ChangeLog
+++ b/dev-util/pmk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/pmk
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/ChangeLog,v 1.8 2007/02/22 02:23:04 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/ChangeLog,v 1.9 2007/03/15 19:35:50 dholm Exp $
+
+*pmk-0.10.1 (15 Mar 2007)
+
+  15 Mar 2007; <dholm@gentoo.org> +pmk-0.10.1.ebuild:
+  Version bumped and added fix from James Rowe (jnrowe (at) ukfsn (dot) org).
+  Closes bug #170983.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.

diff --git a/dev-util/pmk/Manifest b/dev-util/pmk/Manifest
index a2a5b1df6af299f5ec9674fcc7acb6f52a4aa580..0e2dd42da5c04b4ab6cc4846585dfe696bab8fc3 100644 (file)
--- a/dev-util/pmk/Manifest
+++ b/dev-util/pmk/Manifest
@@ -1,10 +1,15 @@
 DIST pmk-0.10.0.tar.gz 207424 RMD160 e102e28edc225fbf6508cd0aff188691658874e9 SHA1 28573ba24e59f49a404fd54b425c88355e5c85c7 SHA256 4c6c7a45917a930c67c8c313c99b2f56beacb0b0ae70b6083592c13cb371f754
+DIST pmk-0.10.1.tar.gz 207337 RMD160 aae6f7d6fa75bd319387eccecc189569b1f0277e SHA1 c4f40de46998e98cb39c7b3a67b7fee49ed4f00a SHA256 0cdf7abde165eded40e840d90bc7a1fba5afb0e3aed2a36af94600edd3ca67ad
 DIST pmk-0.8.1.tar.gz 111659 RMD160 aeacfc7a36c10e0b01ed49d16455764c80aed42c SHA1 a9e982e5154528c06fabdd5558f5d30c28cb5188 SHA256 6f286f7299cf82bfd121dcb4443c9d397c6db19dcd1d20507686a1f130ab945d
 DIST pmk-0.8.tar.gz 109806 RMD160 fd77c45bd3ffd9bf9830780e5913ea61b71519f3 SHA1 3099f83ce9bf85d7f4e218cf4078a2824a75dc26 SHA256 ebf6e61fca766b58fa6b9f5e58b3b9b7936cb364c7af9a4850ea48fc753a6c00
 EBUILD pmk-0.10.0.ebuild 1276 RMD160 ee70e6bef5cb48518658c3ec62c31d9634e9cbbe SHA1 0fa2637e8dc69efe4ae6b073a2b5de9b35a8aa46 SHA256 f204046d68cbec0dabdcfa4c5980b0a24977c71ec23b0b1f18dacff8830a433b
 MD5 f3717e88a3d23d81510710d08dd6a74d pmk-0.10.0.ebuild 1276
 RMD160 ee70e6bef5cb48518658c3ec62c31d9634e9cbbe pmk-0.10.0.ebuild 1276
 SHA256 f204046d68cbec0dabdcfa4c5980b0a24977c71ec23b0b1f18dacff8830a433b pmk-0.10.0.ebuild 1276
+EBUILD pmk-0.10.1.ebuild 1364 RMD160 a870c50889dee3321ef26d0ed926463cb5df92fe SHA1 b36ba182ec37745ed465f546a22a85d98bb79379 SHA256 266dd471b773de96cac48a60965e6e2979881ee7042a09c5711769c9ee1599e3
+MD5 468383de7f244d29cfe8f956d3325865 pmk-0.10.1.ebuild 1364
+RMD160 a870c50889dee3321ef26d0ed926463cb5df92fe pmk-0.10.1.ebuild 1364
+SHA256 266dd471b773de96cac48a60965e6e2979881ee7042a09c5711769c9ee1599e3 pmk-0.10.1.ebuild 1364
 EBUILD pmk-0.8.1-r1.ebuild 1002 RMD160 62464fc4842bbfcc22483c4a7f81e558a2a3b001 SHA1 a5c319bd4b3401a8f9fdd8f7558dbaf96f4f51d2 SHA256 6e29992aaa3f0ed4ccbd183e5fab9c250884e53e097f06844d642e1086e67dd3
 MD5 581904ffd89ae3548e933b113fa1de17 pmk-0.8.1-r1.ebuild 1002
 RMD160 62464fc4842bbfcc22483c4a7f81e558a2a3b001 pmk-0.8.1-r1.ebuild 1002
@@ -17,10 +22,10 @@ EBUILD pmk-0.8.ebuild 634 RMD160 de02656ebaa99c366fa9c755bca98c9e96f6730d SHA1 6
 MD5 0b110ef68684829b84055585c9ff6ff0 pmk-0.8.ebuild 634
 RMD160 de02656ebaa99c366fa9c755bca98c9e96f6730d pmk-0.8.ebuild 634
 SHA256 0dd87acf35df008a8f51b8b42ecb4c6549421697b5c8a7f9a3f20c4afcbae511 pmk-0.8.ebuild 634
-MISC ChangeLog 1107 RMD160 e63f7466c0f7dc5c7ded6a2043bd2c35dec40dff SHA1 e5e21a1809b02ef5157e8f0a0482ad9b9aa539f1 SHA256 7ef991e907193a0f201181da6adacf4f4f26840420c0ad1dfe0c860136cce11a
-MD5 24f1d5031efdae8d1074934c6762c2d8 ChangeLog 1107
-RMD160 e63f7466c0f7dc5c7ded6a2043bd2c35dec40dff ChangeLog 1107
-SHA256 7ef991e907193a0f201181da6adacf4f4f26840420c0ad1dfe0c860136cce11a ChangeLog 1107
+MISC ChangeLog 1289 RMD160 eaa8cd17e1fc4058dbaf0078a8548ff91a11d7a1 SHA1 7f980da3dd06bd750aa4ca0c13d9fe5f253cdafe SHA256 274f735ca1519de02bf135cf22d778609c62f79b12864d1aeb922439b9b5c2b3
+MD5 a6074a2d208b14cccb3aba1806b67afe ChangeLog 1289
+RMD160 eaa8cd17e1fc4058dbaf0078a8548ff91a11d7a1 ChangeLog 1289
+SHA256 274f735ca1519de02bf135cf22d778609c62f79b12864d1aeb922439b9b5c2b3 ChangeLog 1289
 MISC metadata.xml 418 RMD160 baf4766c29482a748bbf1e52751114288f1a0764 SHA1 b185bd993db1fe2a5714afa375fdefcc57ecb735 SHA256 4904a80f0f78d6acae19224e7a2a59046a092cbf586439b2930da0d185df9819
 MD5 2f0670a358dda6bc2bb35664e25a3a40 metadata.xml 418
 RMD160 baf4766c29482a748bbf1e52751114288f1a0764 metadata.xml 418
@@ -28,6 +33,9 @@ SHA256 4904a80f0f78d6acae19224e7a2a59046a092cbf586439b2930da0d185df9819 metadata
 MD5 f9d5d19213e14fce534e629ffa11574d files/digest-pmk-0.10.0 232
 RMD160 048735e2f7fd98fa78a5fc7041f463a9b1bec41d files/digest-pmk-0.10.0 232
 SHA256 a48695be599061997ced95a9032843a1e67941774c6b91f62a37448427e8d4e6 files/digest-pmk-0.10.0 232
+MD5 95578bc95b9928c58bc1351c12833684 files/digest-pmk-0.10.1 232
+RMD160 7c4450d1c71677ddb9dcd1c8653ab13f344be37b files/digest-pmk-0.10.1 232
+SHA256 a448cdd2b8c439af098125ef0b19a70b48f5a2f4f6dbf179272d443639c4848d files/digest-pmk-0.10.1 232
 MD5 077b2ae96fd1fa3753edcecf987e1053 files/digest-pmk-0.8 223
 RMD160 a784229aeccc2cd4a81b650525959e254cf05f7a files/digest-pmk-0.8 223
 SHA256 ca67bcf45c5be774a9229ce472e625ebbca48608efc2bd3c0641c8d62cbd7e24 files/digest-pmk-0.8 223

diff --git a/dev-util/pmk/files/digest-pmk-0.10.1 b/dev-util/pmk/files/digest-pmk-0.10.1
new file mode 100644 (file)
index 0000000..768df54
--- /dev/null
+++ b/dev-util/pmk/files/digest-pmk-0.10.1
@@ -0,0 +1,3 @@
+MD5 98587c97adda6785bb0615a420815dae pmk-0.10.1.tar.gz 207337
+RMD160 aae6f7d6fa75bd319387eccecc189569b1f0277e pmk-0.10.1.tar.gz 207337
+SHA256 0cdf7abde165eded40e840d90bc7a1fba5afb0e3aed2a36af94600edd3ca67ad pmk-0.10.1.tar.gz 207337

diff --git a/dev-util/pmk/pmk-0.10.1.ebuild b/dev-util/pmk/pmk-0.10.1.ebuild
new file mode 100644 (file)
index 0000000..d449eaa
--- /dev/null
+++ b/dev-util/pmk/pmk-0.10.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/pmk-0.10.1.ebuild,v 1.1 2007/03/15 19:35:50 dholm Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Aims to be an alternative to GNU autoconf"
+HOMEPAGE="http://pmk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pmk/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Remove executable stack
+       cp detect_cpu_asm.s detect_cpu_asm.S
+       cat >> detect_cpu_asm.S <<EOF
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
+EOF
+}
+
+src_compile() {
+       tc-export CC CPP AS
+       ./pmkcfg.sh -p /usr || die "Config failed"
+       emake || die "Build failed"
+}
+
+src_install () {
+       make DESTDIR="${D}" MANDIR=/usr/share/man install || die
+
+       dodoc BUGS Changelog INSTALL LICENSE README STATUS TODO
+}
+
+pkg_postinst() {
+       if [[ ! -f ${ROOT}etc/pmk/pmk.conf ]] ; then
+               einfo
+               einfo "${ROOT}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\"
+               # remove the automatically created backup from the extra run
+               rm -f ${ROOT}etc/pmk/pmk.conf.bak
+       fi
+}
+