Version bump. Drop old. Keyword ~amd64. Add myself to metadata.xml.

(Portage version: -svn/cvs/Linux 2.6.26-gentoo x86_64)

7 files changed, 21 insertions, 156 deletions

diff --git a/dev-util/pmk/ChangeLog b/dev-util/pmk/ChangeLog
index 02e2bf9298d9..67f653b152bd 100644
--- a/dev-util/pmk/ChangeLog
+++ b/dev-util/pmk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2007/12/25 13:02:36 phreak Exp $
+# 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 $
+
+*pmk-0.10.4 (25 Sep 2008)
+
+  25 Sep 2008; Ali Polatel <hawking@gentoo.org> metadata.xml,
+  -pmk-0.8.ebuild, -pmk-0.8.1.ebuild, -pmk-0.8.1-r1.ebuild,
+  -pmk-0.10.0.ebuild, -pmk-0.10.1.ebuild, +pmk-0.10.4.ebuild:
+  Version bump. Drop old. Keyword ~amd64. Add myself to metadata.xml.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing dholm from metadata.xml as per #24623. Assigning to maintainer-needed.
diff --git a/dev-util/pmk/metadata.xml b/dev-util/pmk/metadata.xml
index 2db8b7c86c58..9c6d256c1d2c 100644
--- a/dev-util/pmk/metadata.xml
+++ b/dev-util/pmk/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>hawking@gentoo.org</email>
+		<name>Ali Polatel</name>
 	</maintainer>
 	<longdescription>
 		The meaning of pmk is "Pre Make Kit", a dependency configuring tool. It
diff --git a/dev-util/pmk/pmk-0.10.0.ebuild b/dev-util/pmk/pmk-0.10.0.ebuild
deleted file mode 100644
index 41475bbcb999..000000000000
--- a/dev-util/pmk/pmk-0.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/pmk-0.10.0.ebuild,v 1.2 2007/07/12 01:05:42 mr_bones_ 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" &>/dev/null
-	fi
-}
diff --git a/dev-util/pmk/pmk-0.10.1.ebuild b/dev-util/pmk/pmk-0.10.4.ebuild
index 598cc4c75c8c..07efb778c8c4 100644
--- a/dev-util/pmk/pmk-0.10.1.ebuild
+++ b/dev-util/pmk/pmk-0.10.4.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.2 2007/07/12 01:05:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/pmk-0.10.4.ebuild,v 1.1 2008/09/25 14:29:10 hawking 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"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 DEPEND=""
@@ -36,22 +36,22 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR="${D}" MANDIR=/usr/share/man install || die
+	make DESTDIR="${D}" MANDIR=/usr/share/man install || die "make failed"
 
-	dodoc BUGS Changelog INSTALL LICENSE README STATUS TODO
+	dodoc BUGS Changelog README STATUS TODO || die "dodoc failed"
 }
 
 pkg_postinst() {
-	if [[ ! -f ${ROOT}etc/pmk/pmk.conf ]] ; then
+	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
+		"${ROOT}"/usr/bin/pmksetup
 		# run it again to reset PREFIX from /usr/local to /usr
-		${ROOT}usr/bin/pmksetup -u PREFIX=\"/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
+		rm -f "${ROOT}"/etc/pmk/pmk.conf.bak
 	fi
 }
diff --git a/dev-util/pmk/pmk-0.8.1-r1.ebuild b/dev-util/pmk/pmk-0.8.1-r1.ebuild
deleted file mode 100644
index b9407a1caf1b..000000000000
--- a/dev-util/pmk/pmk-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/pmk-0.8.1-r1.ebuild,v 1.1 2006/12/08 22:25:38 masterdriverz Exp $
-
-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=""
-
-src_compile() {
-	./pmkcfg.sh -p /usr
-	emake || die "Build failed"
-}
-
-src_install () {
-	emake 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/sbin/pmksetup
-		# run it again to reset PREFIX from /usr/local to /usr
-		${ROOT}usr/sbin/pmksetup -u PREFIX="/usr" &>/dev/null
-	fi
-}
diff --git a/dev-util/pmk/pmk-0.8.1.ebuild b/dev-util/pmk/pmk-0.8.1.ebuild
deleted file mode 100644
index e14af9038d5b..000000000000
--- a/dev-util/pmk/pmk-0.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/pmk-0.8.1.ebuild,v 1.4 2004/07/02 05:12:13 eradicator Exp $
-
-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="virtual/libc"
-
-src_compile() {
-	./pmkcfg.sh -p /usr
-	make || die "Build failed"
-}
-
-src_install () {
-	make DESTDIR=${D} MANDIR=/usr/share/man install || die
-
-	dodoc BUGS Changelog INSTALL LICENSE README STATUS TODO
-}
diff --git a/dev-util/pmk/pmk-0.8.ebuild b/dev-util/pmk/pmk-0.8.ebuild
deleted file mode 100644
index 6367b7bcc0fd..000000000000
--- a/dev-util/pmk/pmk-0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmk/pmk-0.8.ebuild,v 1.4 2004/07/02 05:12:13 eradicator Exp $
-
-DESCRIPTION="Aims to be an alternative to GNU autoconf"
-SRC_URI="mirror://sourceforge/pmk/${P}.tar.gz"
-HOMEPAGE="http://pmk.sourceforge.net/"
-
-LICENSE="BSD"
-IUSE=""
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	./pmkcfg.sh -p /usr
-	make || die "Build failed"
-}
-
-src_install () {
-	make DESTDIR=${D} MANDIR=/usr/share/man install || die
-
-	dodoc BUGS Changelog INSTALL LICENSE README STATUS TODO
-}