Fix tests, bug #404989. Version bump, drop merged patch.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 50 insertions, 7 deletions

diff --git a/dev-util/dmake/ChangeLog b/dev-util/dmake/ChangeLog
index 7d12a6fd11a8..cba22b95fd02 100644
--- a/dev-util/dmake/ChangeLog
+++ b/dev-util/dmake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/dmake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/ChangeLog,v 1.26 2012/05/13 20:32:08 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/ChangeLog,v 1.27 2012/05/13 23:59:25 chithanh Exp $
+
+*dmake-4.12.2 (13 May 2012)
+
+  13 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +dmake-4.12.2.ebuild, dmake-4.12.ebuild:
+  Fix tests, bug #404989. Version bump, drop merged patch.
 
   13 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   dmake-4.12.ebuild:
diff --git a/dev-util/dmake/Manifest b/dev-util/dmake/Manifest
index 0a48315d3d86..8ba56d240fc0 100644
--- a/dev-util/dmake/Manifest
+++ b/dev-util/dmake/Manifest
@@ -1,8 +1,10 @@
 AUX 4.12-fix-overlapping-stcpys.patch 6654 RMD160 0f12776b131501be3e2c969ef9954484dd5cc00f SHA1 44eb17cb280bc3c387dc52c86c4962ec02ee7112 SHA256 dbbfebfc860a81b66b818648eb9500b2757f340bcff5aa31c24240f239ad80fe
 AUX dmake-4.1-r1.diff 5005 RMD160 1850bd6061b9b3ea5573ddc630f3d2ea34e08c5b SHA1 d224098328f0dc54b7c7f0a14ab0b1b61c93424a SHA256 fefc508c0a55740f41a1f1cac85c12227be847e6013368e1db19fe1405fb22e3
+DIST dmake-4.12.2.tar.bz2 461738 RMD160 c7440f84999ed30a2879260f90f75196934ec0db SHA1 375a58b516020549951bb16a46b4d4e787cd1e51 SHA256 2fcbf389a9baaec25a973bd0d9e338069ad427b17d2adc7dc023efb034e96057
 DIST dmake-4.1pl1-src.tar.gz 473427 RMD160 ba76d48a6057b6af01b8abd7c72cc7521f60a983 SHA1 6262a38d58fdb69242ddfe663be9caada1882d64 SHA256 98aca7d485e1c6284b439d6e7636b7636d9969869bbc190f27eba475d4cacc6f
 DIST dmake_4.12.orig.tar.gz 745531 RMD160 c36d8c2f6f89d39103dcdcfb90fdcd3df02e3f94 SHA1 dbdb9c9f226cdac508a391e3cd0d8a0c2e6ccb46 SHA256 142aea347a825f10a37c5f8a39584dcc96a15838b17ea418172834a8778ba205
 EBUILD dmake-4.1-r1.ebuild 1011 RMD160 79cbbffe25123c8f937b61ae8c6c3625ddb507e7 SHA1 267cccc518464906ae44613766e9da9d6f630afc SHA256 baaf24023a4d69bdad9bc3191a1797b45f459f465d29064a7c16d14b6accd915
-EBUILD dmake-4.12.ebuild 727 RMD160 c59f24e651b01f7170298725713220b28fe28fad SHA1 c99d8b82c11d9efb272f26e5ff9f35d90d16a40c SHA256 e36fea14d37387d937f0d89998107146366455da465390e0b6a8eff347bc3ae4
-MISC ChangeLog 3436 RMD160 497d1759a251eb926d7c8cd0d3b12b3ad71429f2 SHA1 93c8bc5fac8a7eb1e9734bd329fcdf28fbcfeeea SHA256 5b8ef047b4e0735e92c7a6e6495f744143c5aca6e48cb00382ee31f6bdd2e646
+EBUILD dmake-4.12.2.ebuild 857 RMD160 82fa0c720c8fbe8137134b010b2ee9d5f4e50b3b SHA1 b85826c80b563c917ee8a3a161f1111ad1a33844 SHA256 c743322d106e6ad8496c94219dd63d563a01e5ec6fb7dcd9ebdb907ad60cc6f5
+EBUILD dmake-4.12.ebuild 761 RMD160 02532b904c92fce0dad7e4d262747d7dab2f8aa8 SHA1 ed074621cd00a3f5a9bbb8a086ab6f0f3171e3cc SHA256 7415a4edeb90c2a977aae6392c95e7bec124b05e87815b2baa3358e8cf99135e
+MISC ChangeLog 3637 RMD160 e9a04392a87bf38f9cb4e65a4b4711412c56825e SHA1 f9740c5db4656d2ab5cfa721948566890ae82f53 SHA256 a6ec1f4d1bb7d307f2c86e751a24d25a0d083826d8bda6ab20810148d05acad8
 MISC metadata.xml 253 RMD160 b3e03a7854542a9efb44bff54089962b09f5340b SHA1 0363e7e4f6ccfb8109ddb5e656575e0047a27437 SHA256 2033971042ce53f0af10bdc9f59bd2aba7b8490f0eafbca62a9e8ffd49d23c5d
diff --git a/dev-util/dmake/dmake-4.12.2.ebuild b/dev-util/dmake/dmake-4.12.2.ebuild
new file mode 100644
index 000000000000..54476feacd1b
--- /dev/null
+++ b/dev-util/dmake/dmake-4.12.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/dmake-4.12.2.ebuild,v 1.1 2012/05/13 23:59:25 chithanh Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Improved make"
+HOMEPAGE="http://code.google.com/a/apache-extras.org/p/dmake/"
+SRC_URI="http://${PN}.apache-extras.org.codespot.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+# test failure, reported upstream at
+# http://code.google.com/a/apache-extras.org/p/dmake/issues/detail?id=1
+RESTRICT="test"
+
+DEPEND="
+	app-arch/unzip
+	sys-apps/groff
+"
+RDEPEND=""
+
+src_prepare() {
+	# make tests executable, bug #404989
+	chmod +x tests/targets-{1..12} || die
+}
+
+src_install () {
+	default
+	newman man/dmake.tf dmake.1
+}
diff --git a/dev-util/dmake/dmake-4.12.ebuild b/dev-util/dmake/dmake-4.12.ebuild
index 079029db4706..85456e8b2ca9 100644
--- a/dev-util/dmake/dmake-4.12.ebuild
+++ b/dev-util/dmake/dmake-4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/dmake-4.12.ebuild,v 1.2 2012/05/13 20:32:07 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dmake/dmake-4.12.ebuild,v 1.3 2012/05/13 23:59:25 chithanh Exp $
 
 EAPI=4
 
@@ -15,9 +15,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-# tests fail, bug #404989
-RESTRICT="test"
-
 DEPEND="
 	app-arch/unzip
 	sys-apps/groff
@@ -26,6 +23,8 @@ RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-fix-overlapping-stcpys.patch"
+	# make tests executable, bug #404989
+	chmod +x tests/targets-{1..12} || die
 }
 
 src_install () {