sys-cluster/torque: Bump EAPI and give some prefix love

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 67 insertions, 48 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index e7e5b6d2a33a..4d7b58d3f81d 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.168 2014/06/19 20:31:24 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.169 2014/09/18 13:19:21 jlec Exp $
+
+  18 Sep 2014; Justin Lecher <jlec@gentoo.org> torque-4.1.7.ebuild:
+  Bump EAPI and give some prefix love
 
 *torque-4.1.7 (19 Jun 2014)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 094e89469fd3..b30f3b34f415 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX CVE-2013-4319-2.x-root-submit-fix.patch 1253 SHA256 a6ebd0c0966148ecb34fb885911e163f93749be72fc5a2e58f11f3c7a9523f45 SHA512 78780ad87e997f22b6abbc3cb51c313616e90320d997705c534c35fbc7f5738b7a2e0ace33051e6e15d4f6e0ab6f97ab9f1ef60dcee5fc4544db13b0a72ea5c4 WHIRLPOOL 64eaf701099da902282b3e1debb6bbfa323fc266ad067047c43dcb353463bf2df7475066f9e263cc9a506b2905aba19c290d50a419ee56a0daa65f237693ede7
 AUX CVE-2013-4319-4.x-root-submit-fix.patch 1412 SHA256 ef88bbbfbda9f7c0d8a98fbd4a0b02e9c662678ba02eac12fbc50521d4d01581 SHA512 89f0b5fedfef5b0db1cdb3d190c7c2fa9c07d175e9b3020ec685e9553d710882ece1155249edeea25902c134ce52bf171fd1e7b2256716351e0e80d3fca5618c WHIRLPOOL 7ee954e3bae8336489bc4e2aed43256d2ecff29e332076255013c78415b4cc5b159b15ab1bc5575493df676393ecd0fd89a1dff4493374f689d3258ad2b7ae57
@@ -24,13 +24,25 @@ DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d8361
 EBUILD torque-2.5.12-r1.ebuild 7637 SHA256 06709db3e6a4de2c545467584813f05385b76e64350f77e9c70b3559aae068fb SHA512 ec992ccb9430bf74e85025b3d23154f2a91c2281e9b424818002d75873152940424543c7b06e70b3c2d3d58a15b4e241022b42128a189fe587833918eed0eac7 WHIRLPOOL ee89d2da1fdbd11bcc8e3012b0c4acdc895271e483e9d70ca2e7d7db65e3532f2d251b70884757861842c0708cdfdf8ceef2cd15d61f786a361ca1dc7084e8d9
 EBUILD torque-2.5.13.ebuild 7749 SHA256 d6341222bcd51c48f59f0d1703cefae99e81665251da24ee2bc29391f82a05fa SHA512 9fc230bd7b698faa26eca29efbfe1f05843d4385e034de5194a638c22ddc3d8e35f36406685ade448094f8b1f9b89bac2f961aafa1739f5cce850f0693fd2185 WHIRLPOOL 14e1bd68466c463be5063f3db371a14588ad84db0fe6629f7fecf244ae2669d63c683da6f665e7e54ce369b152cd53ba80d1f1f26f5f96a5bc73261e2526e39f
 EBUILD torque-4.1.5.1-r1.ebuild 7128 SHA256 81805f6dcf0d469c9e496f223a7690757c55bd9d7225b7eac2233566383d9cb8 SHA512 03e920f78833f41d5a2b83484df73ff8bd29ec83e85f63dbbd07922d5609e921e47a7d91da6689caad72afd537dc16dab7b7b6db4a9c7ef1c747905e7424cb92 WHIRLPOOL 8bb64bf0223ec2e710d04159e6943e400bc44158f76b0b90688ac1d9a13a89c2da44caaeb8ba4f0da50653d86bb6922f31d0cc7ed54344c4f7f5ba01d9feddc4
-EBUILD torque-4.1.7.ebuild 7142 SHA256 9958d76b039c7ac09d19286fd8908165bf1eed0b948dadff97e541aa325a89d1 SHA512 998f09aefb18a28d6110c8d86dda822fa62321a3736ac40381f23c9aef32dfa1c95a6d329e494eb1795a1b0842b751d4999bcbaaae10d2361955ebe5d8f7be64 WHIRLPOOL a83ebe748b470cb2fc373ab699864b14ff0f9ba2e81d9d320525993ebd74482b6d2aa7895428fb00ab88dd9165bdddcbf84f7a143adc92b96d1e30f9bfe23f15
-MISC ChangeLog 28728 SHA256 c576758637b5c05c3467fd47bdfa4a147c56fa697fc8d2ff10f5575d4dcfd4ab SHA512 f287583de48d4e5b4c535d136ee9a7a2f513cde5b904244d748e712476830c6acac8ff8a7e3bf2d291364c2e19fc1621efdffaa80ed15472d9f8405c77cfacbe WHIRLPOOL 2ea79a2a679e8960929a39e91e5421ec5222cb973f83a6b58532b74824a90206dcc6d7553422c9bbde616508918b13c33bf922ad171ca8b024b2ea4fabad4e6d
+EBUILD torque-4.1.7.ebuild 7084 SHA256 2c96df24876569453b2ef1b3107e02194a4f7c601d06817527e025b97bb7fb51 SHA512 5a35a81454b432a90de38c3f5407dc35dd8f704515dcccecf4c7cc572812e81752127ffc14438d9f284057358645e902e93c9404f5bd16c005be56c25f8dcda9 WHIRLPOOL f95005a34282266c7f65d63f279c46de685d6a489ad5a34bfa4825ef38ca440be53f3cba97fefa173b60f82f0254ade8e29940a2bfedf6c6e0fb9039a53b6ea3
+MISC ChangeLog 28830 SHA256 49e31a9ef66f8c2b2155df834e984366f51b0fa9fadae743692dd74dd58c0de0 SHA512 96401e84fa4cea87fca423855724cc0d7fcb0c7037deb432e8ce473c34fc14de29796bf927ebd965b06a59a5307ee4ae91fc7759bea30e4540043543aff2cba3 WHIRLPOOL 0923392bcea64ea4d8158b770cbb2f8c946c109692e3231dfef6e21f919e0198ecfaf39f8d3d2683ec8449d1475f885aab90fd821b5bb28f6f314f30306f3122
 MISC metadata.xml 628 SHA256 10fab1886476e44fabbcda6e7dbbc8452d07cb0de0cefcf6e594312dfe89f7af SHA512 d1c78c4247f209eda60a61c9c611c4a4b87d52f85b112a78b96a4dee6f3cd660aef49547323074d69ffce8c1b916c3914f00282781e2f68f76658e6f9ac7ff9b WHIRLPOOL 243373e602f92a256118e6bee6c3071d5894caf3d53a663abee6929a310cf306b15a6a7bd2a0e76882cfe36cd4e8b6c06bb9e12f49f678d085883d61d4a84cf9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlOjSJ4ACgkQ4MrvBE1wQ8n3ZQCeMdOzSthwm4XLk61RbdEOIjIV
-Q5IAn0Lkyp+7H0ppKcz2++Et02J2aV3N
-=pAKR
+iQJ8BAEBCgBmBQJUGtvaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1mYP/Aq2t0FbHUKAngMScpFbq+ap
+sUy/a+ZVD+yd1YM5azLk/bRoXbAEYgfzay/Iv3HUKSNk258O27vMpWljs9H10eq7
+QKwgX9d+anFMwLMVmUlIBoNUM6WCPXuVqRFOX+z1hOChJr21gvrAjt95lVsk0EVa
+VyM8Xr7TPLCJdGqQ2YDfbIOwm9nePy7noOtsPuwOSy7bii5jKBKOCj4GwEWqKT9Q
+gkqRPkdQlLPglzohr62bfD/nCePP/UDRgj/uK0991BUgkaEVduT+4xWxPgGBPeKu
+XPc7iFQ1cbVl2AOpuRNs4zgAJHg9aBc82Xi1DJVMqCEzObQQJArcAcjdw6BOguGF
+BT5zKcpdrQKfkdGdouYICZ6TAhdHY4ITBrBAadETzOX3PJE27bbyiEiTEvnQZboX
+h9+354UHGSnZUcbrAdX95E0hziMWEU+ewYe0t7a21j/WiEhIlQ720ZwfC+jEGrgf
+ZblTLQhIHt1kP14SdGNo7xRq6L+wqjHrnb01ykr5Zp7GXsAAOrIggH57ydfSxlBA
+QJ/ASMmPg5qMIs7+B0iBfOyqw4weRcIIfNtvi797PDRDKRBfVklibm7LbVjB0ACe
+Ke9KAha2W5Rjh859X1gERARTKBaAJmBaxsbUs3sc3jfDqos1oCpM6LCfTRtqh8QT
+PoBz8jFDuazpg31KGuYp
+=KGdt
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-4.1.7.ebuild b/sys-cluster/torque/torque-4.1.7.ebuild
index 896e03f6edf9..a9b07b717e3c 100644
--- a/sys-cluster/torque/torque-4.1.7.ebuild
+++ b/sys-cluster/torque/torque-4.1.7.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.7.ebuild,v 1.1 2014/06/19 20:31:24 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.7.ebuild,v 1.2 2014/09/18 13:19:21 jlec Exp $
+
+EAPI=5
 
-EAPI=4
 inherit flag-o-matic eutils linux-info
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
@@ -10,13 +11,14 @@ HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
 # TODO:  hopefully moving to github tags soon
 # http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html
 SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz"
-LICENSE="torque-2.5"
 
+LICENSE="torque-2.5"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
 
-DEPEND_COMMON="sys-libs/ncurses
+DEPEND_COMMON="
+	sys-libs/ncurses
 	sys-libs/readline
 	cpusets? ( sys-apps/hwloc )
 	munge? ( sys-auth/munge )
@@ -33,7 +35,7 @@ RDEPEND="${DEPEND_COMMON}
 	!crypt? ( net-misc/netkit-rsh )"
 
 pkg_setup() {
-	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
+	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}"
 
 	# Find a Torque server to use.  Check environment, then
 	# current setup (if any), and fall back on current hostname.
@@ -74,7 +76,7 @@ src_prepare() {
 	# --without-loadlibfile is supposed to do this for us...
 	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
 
-	epatch "${FILESDIR}"/torque-4.1.5.1-tcl8.6.patch
+	epatch "${FILESDIR}"/${PN}-4.1.5.1-tcl8.6.patch
 
 	# 491270
 	epatch "${FILESDIR}"/CVE-2013-4495.4.1.patch
@@ -105,53 +107,53 @@ src_configure() {
 src_install() {
 	local dir
 
-	emake DESTDIR="${D}" install || die "make install failed"
+	DOCS=( CHANGELOG README.* Release_Notes )
+	use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf )
 
-	dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-	fi
+	default
 
 	# The build script isn't alternative install location friendly,
 	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
-	for file in `find "${D}" -iname tclIndex`; do
-		sed -e "s/${D//\// }/ /" "${file}" > "${file}.new"
-		mv "${file}.new" "${file}" || die
+	for file in $(find "${ED}" -iname tclIndex); do
+		sed \
+			-e "s/${ED//\// }/ /" \
+			-i "${file}" || die
 	done
 
-	for dir in $(find "${D}/${PBS_SERVER_HOME}" -type d); do
-		keepdir "${dir#${D}}"
+	for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do
+		keepdir "${dir#${ED}}"
 	done
 
 	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server || die
-		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched || die
+		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
+		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
 	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom || die
-	newconfd "${FILESDIR}"/torque-conf.d-munge torque || die
-	newinitd "${FILESDIR}"/trqauthd-init.d trqauthd || die
-	newenvd "${FILESDIR}"/torque-env.d 25torque || die
+	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
+	newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN}
+	newinitd "${FILESDIR}"/trqauthd-init.d trqauthd
+	newenvd "${FILESDIR}"/${PN}-env.d 25${PN}
 }
 
 pkg_preinst() {
 	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die
+		cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
 	fi
 
 	if [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
-		cp "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
-			"${D}"/${PBS_SERVER_HOME}/server_priv/nodes || die
+		cp \
+			"${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
+			"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
 	fi
 
-	echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" || die
+	echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die
 
 	# Fix up the env.d file to use our set server home.
-	sed -i \
-		"s:/var/spool/torque:${PBS_SERVER_HOME}:g" "${D}"/etc/env.d/25torque \
-		|| die
+	sed \
+		-e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \
+		-i "${ED}"/etc/env.d/25${PN} || die
 
 	if use munge; then
-		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/torque || die
+		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die
 	fi
 }
 
@@ -159,14 +161,16 @@ pkg_postinst() {
 	elog "    If this is the first time torque has been installed, then you are not"
 	elog "ready to start the server.  Please refer to the documentation located at:"
 	elog "http://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki"
-
+	echo ""
 	elog "    For a basic setup, you may use emerge --config ${PN}"
-
-	elog "Important 4.0+ updates"
-	elog "  - The on-wire protocol version has been changed."
-	elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
-	elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
-	elog "    trqauthd to your default runlevel."
+	echo ""
+	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
+		elog "Important 4.0+ updates"
+		elog "  - The on-wire protocol version has been changed."
+		elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
+		elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
+		elog "    trqauthd to your default runlevel."
+	fi
 }
 
 # root will be setup as the primary operator/manager, the local machine
@@ -193,9 +197,9 @@ pkg_config() {
 	echo "\$logevent 255" >> "${h}/mom_priv/config" || die
 
 	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
+		local qmgr="${EROOT}/usr/bin/qmgr -c"
 		# pbs_server bails on repeated backslashes.
-		if ! "${ROOT}"/usr/sbin/pbs_server -f -d "${h}" -t create; then
+		if ! "${EROOT}"/usr/sbin/pbs_server -f -d "${h}" -t create; then
 			eerror "Failed to start pbs_server"
 			rc=1
 		else
@@ -209,7 +213,7 @@ pkg_config() {
 				&& ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} \
 				|| die
 
-			"${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1
+			"${EROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1
 
 			# Add the local machine as a node.
 			echo "$(hostname -f) np=1" > "${h}/server_priv/nodes" || die