commit: 2565e966b69bf45c521b57fc07d863f164d9680b Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> AuthorDate: Fri Aug 12 12:38:39 2016 +0000 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> CommitDate: Fri Aug 12 12:38:39 2016 +0000 URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=2565e966
sys-cluster/maui: several fixes - GLEP 67 update - EAPI 6 bump - runscript -> openrc-run sys-cluster/maui/files/maui.initd | 4 ++-- sys-cluster/maui/maui-3.3.1-r2.ebuild | 21 ++++++++++----------- sys-cluster/maui/metadata.xml | 13 ++++++++----- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/sys-cluster/maui/files/maui.initd b/sys-cluster/maui/files/maui.initd index b8d747e..141fc97 100644 --- a/sys-cluster/maui/files/maui.initd +++ b/sys-cluster/maui/files/maui.initd @@ -1,5 +1,5 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/files/maui.initd,v 1.3 2011/07/03 23:19:35 alexxy Exp $ diff --git a/sys-cluster/maui/maui-3.3.1-r2.ebuild b/sys-cluster/maui/maui-3.3.1-r2.ebuild index 67c996a..4bbdf0e 100644 --- a/sys-cluster/maui/maui-3.3.1-r2.ebuild +++ b/sys-cluster/maui/maui-3.3.1-r2.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/maui-3.3.1-r2.ebuild,v 1.4 2011/10/31 10:30:09 jlec Exp $ +# $Id$ -EAPI="4" - -inherit eutils multilib +EAPI="6" DESCRIPTION="Maui Cluster Scheduler" -HOMEPAGE="http://www.clusterresources.com/pages/products/maui-cluster-scheduler.php"; +HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/maui/"; SRC_URI="http://www.adaptivecomputing.com/download/${PN}/${P}.tar.gz"; LICENSE="maui" @@ -24,6 +22,8 @@ RDEPEND="${DEPEND}" RESTRICT="fetch mirror" +PATCHES=( "${FILESDIR}/${P}-showstats.patch" ) + pkg_setup() { if use slurm; then if [ -z ${MAUI_KEY} ]; then @@ -36,7 +36,7 @@ pkg_setup() { src_prepare() { sed -e "s:\$(INST_DIR)/lib:\$(INST_DIR)/$(get_libdir):" \ -i src/{moab,server,mcom}/Makefile || die - epatch "${FILESDIR}/${P}-showstats.patch" + default } src_configure() { @@ -49,10 +49,9 @@ src_configure() { } src_install() { - emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install || die - dodoc docs/README CHANGELOG || die - dohtml docs/mauidocs.html || die - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install + dodoc docs/README CHANGELOG docs/mauidocs.html + newinitd "${FILESDIR}/${PN}.initd" ${PN} } pkg_nofetch() { diff --git a/sys-cluster/maui/metadata.xml b/sys-cluster/maui/metadata.xml index 9db9d48..9baf5ea 100644 --- a/sys-cluster/maui/metadata.xml +++ b/sys-cluster/maui/metadata.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <herd>cluster</herd> - <use> - <flag name="pbs">Enable pbs integration</flag> - <flag name="slurm">Enable slurm integration</flag> - </use> + <maintainer type="project"> + <email>clus...@gentoo.org</email> + <name>Gentoo Cluster Project</name> + </maintainer> + <use> + <flag name="pbs">Enable pbs integration</flag> + <flag name="slurm">Enable slurm integration</flag> + </use> </pkgmetadata>
