Fix parallel-build for make test. Skip test if EUID == 0, bug 277932. Add gentoolkit-dev-9999

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 63 insertions, 2 deletions

diff --git a/app-portage/gentoolkit-dev/ChangeLog b/app-portage/gentoolkit-dev/ChangeLog
index 54d607d136e3..dae7bdaebeae 100644
--- a/app-portage/gentoolkit-dev/ChangeLog
+++ b/app-portage/gentoolkit-dev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/gentoolkit-dev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.72 2009/07/22 14:48:32 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.73 2009/08/01 20:30:29 idl0r Exp $
+
+*gentoolkit-dev-9999 (01 Aug 2009)
+
+  01 Aug 2009; Christian Ruppert <idl0r@gentoo.org>
+  gentoolkit-dev-0.2.6.12.ebuild, +gentoolkit-dev-9999.ebuild:
+  Fix parallel-build for make test. Skip test if EUID == 0, bug 277932. Add
+  gentoolkit-dev-9999
 
   22 Jul 2009; <chainsaw@gentoo.org> gentoolkit-dev-0.2.6.12.ebuild:
   Marked stable AMD64 as requested by Christian Ruppert (idl0r)
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.12.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.12.ebuild
index 68e1d0bb78bb..8739c2b1274e 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.12.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.12.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.12.ebuild,v 1.9 2009/07/22 14:48:32 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.12.ebuild,v 1.10 2009/08/01 20:30:29 idl0r Exp $
+
+EAPI="2"
 
 DESCRIPTION="Collection of developer scripts for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -16,6 +18,22 @@ RDEPEND="${DEPEND}
 	sys-apps/portage
 	dev-lang/perl"
 
+src_prepare() {
+	# Fix parallel-build
+	sed -i -r -e 's:make (-C src/echangelog test):$(MAKE) \1:' Makefile || die
+}
+
+src_test() {
+	# echangelog test is not able to run as root
+	# the EUID check may not work for everybody
+	if [[ ${EUID} -ne 0 ]];
+	then
+		emake test || die
+	else
+		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
+	fi
+}
+
 src_install() {
 	emake DESTDIR="${D}" install-gentoolkit-dev || die
 }
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
new file mode 100644
index 000000000000..8924f813d279
--- /dev/null
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.1 2009/08/01 20:30:29 idl0r Exp $
+
+inherit subversion
+
+DESCRIPTION="Collection of developer scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	sys-apps/portage
+	dev-lang/perl"
+
+ESVN_REPO_URI="svn://anonsvn.gentoo.org/gentoolkit/trunk/${PN}"
+
+src_test() {
+	# echangelog test is not able to run as root
+	# the EUID check may not work for everybody
+	if [[ ${EUID} -ne 0 ]];
+	then
+		emake test || die
+	else
+		ewarn "test skipped, please re-run as non-root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}