gentoo resync : 15.12.2019

3 files changed, 5 insertions, 65 deletions

diff --git a/sys-cluster/maui/Manifest b/sys-cluster/maui/Manifest
index 360effd4c703..aa291d310155 100644
--- a/sys-cluster/maui/Manifest
+++ b/sys-cluster/maui/Manifest
@@ -1,6 +1,5 @@
 AUX maui-3.3.1-torque_4.patch 568 BLAKE2B 84f9d45e15ac837c8d00be056e5079538b49281bd64401fcbb25cdb853c93205e0fc6470bdaa44c302018508adcc1477776ce438d332e4044a920cab1ac1a401 SHA512 ac493718454e9d08f9d94aa38ce7a9f6baa58643928eb9d6af738be94aa7dd2b685de98ed0516170656ca94a52b6838a3203c87d64642dfebe81733efc461f18
 AUX maui.initd 477 BLAKE2B 79dbd14bf08201d6d38f466ee0f486aa9402eefd0cb85d99cd2b756966d95665132ccb008ee1997b48114e062508796093b7e99e08fc44a855f7a3752237ae27 SHA512 73748cba13d55a56d7db3e3b36d52726c3e6eb54a177f87dc14aec655e7c19614932116719d121da6808227c9216c3ca59697b4327b3a5fb828ef8c2f6645b3f
 DIST maui-3.3.1.tar.gz 901179 BLAKE2B 57c207c3760b929140ccf998532131d2a879278cb47218a673cba1dda67f8d77180eadaf72c6bbf4c0917db78de5301f851324980917d772d9b955e551ad16f2 SHA512 e22a0f08b40d810792175b5bc15a53831e84eeab43ddc79ebc3e10a2d5c0b77a4634ff67975f9dae06fbb84f84cb3a95e9cbfcb8086734dbd41caee3359675b0
-EBUILD maui-3.3.1-r2.ebuild 1363 BLAKE2B bc528cb955778ff0fc28754447bf5960cde14aa4912fa6a77c2624bf29aa34748bccaec0bded9de074a15270cc7dc0a8a9585285b2dff5e8442dc9996c40996e SHA512 5b5953bfe63b5b6d68a1b08d05304e6a3bd09215ce8e39967eb4c49afb2ee1b48691736937b37bf2b0917f9e49a3f2afaa18d24c2ac1b97488397124dc0eca30
-EBUILD maui-3.3.1-r3.ebuild 1410 BLAKE2B 346cf8da03f67d4804ef8c3034cabb27d40669e51657ede4d4cd7ddae8dcdaa7d805e41021be3a68d70948c4fdb1bee793ec685b30ca8d18935fda5811fdb5de SHA512 f70ca3c8d8c3cdd14c4f71d74d3c8e3c34dfb4e533c19781d518be0227dd3a3d8532ea199319433a77f8411535bd335e76090596a3bcfa3a7870675893305276
+EBUILD maui-3.3.1-r3.ebuild 1382 BLAKE2B aa8223dd47c1b9ad18d510c157550444e4146a012764acbf4a2cb227be747e2668f981bf983687f146e219bb0dd91302421b4ea2ae2bdd9e36ca64d9bad81852 SHA512 819abc743381e39aa0079309c2dd3eaa41af2a399c76ccf0f7c0cc3c65531945cfb157206dff17ab351d443cfc48f9e1d3f9081e7ac3b9c01db7d8a71cc9eae6
 MISC metadata.xml 386 BLAKE2B 42f99e755b29e50569cc3f6b93ca54611d21a57fe905803d3a206ca16e6efdac2e2433a3680e352f88b87c7b745419852eafb6399f587354a96266357c27d6af SHA512 15a026ae2a40cc79038965dc0cff98f4dc4a5c2e231a9a59f46c1360c6b32e2195e1d354be34870cc7ef3033c9182d4b933c1e7625dd1053d062f12321c8130e
diff --git a/sys-cluster/maui/maui-3.3.1-r2.ebuild b/sys-cluster/maui/maui-3.3.1-r2.ebuild
deleted file mode 100644
index f14cfeaf5d75..000000000000
--- a/sys-cluster/maui/maui-3.3.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Maui Cluster Scheduler"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/maui/"
-SRC_URI="http://www.adaptivecomputing.com/download/${PN}/${P}.tar.gz"
-
-LICENSE="maui"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="pbs slurm"
-
-REQUIRED_USE="^^ ( pbs slurm )"
-
-DEPEND="
-	pbs? ( sys-cluster/torque )
-	slurm? ( sys-cluster/slurm )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="fetch mirror"
-
-pkg_setup() {
-	if use slurm; then
-		if [ -z ${MAUI_KEY} ]; then
-			eerror "You should set MAUI_KEY to any integer value in make.conf"
-			return 1
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e "s:\$(INST_DIR)/lib:\$(INST_DIR)/$(get_libdir):" \
-		-i src/{moab,server,mcom}/Makefile || die
-}
-
-src_configure() {
-	local myconf
-	use pbs && myconf="--with-pbs=${EPREFIX}/usr"
-	use slurm && myconf+=" --with-wiki --with-key=${MAUI_KEY}"
-	econf \
-		--with-spooldir="${EPREFIX}"/var/spool/${PN} \
-		${myconf}
-}
-
-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
-}
-
-pkg_nofetch() {
-	einfo "Please visit ${HOMEPAGE}, obtain the file"
-	einfo "${P}.tar.gz and put it in your DISTDIR directory."
-}
diff --git a/sys-cluster/maui/maui-3.3.1-r3.ebuild b/sys-cluster/maui/maui-3.3.1-r3.ebuild
index 8f5c03da2d52..82459ce3849b 100644
--- a/sys-cluster/maui/maui-3.3.1-r3.ebuild
+++ b/sys-cluster/maui/maui-3.3.1-r3.ebuild
@@ -49,10 +49,10 @@ 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
+	dohtml docs/mauidocs.html
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 }
 
 pkg_nofetch() {