sys-cluster/torque: Move to EPAI=4 and autotools-utils for conveniened handling of static-libs, #398019

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 108 insertions, 99 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index d9bfb5916149..5fb2ae94f4ec 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.144 2012/11/02 06:09:52 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.145 2012/12/13 16:21:38 jlec Exp $
+
+  13 Dec 2012; Justin Lecher <jlec@gentoo.org> torque-2.5.9.ebuild,
+  torque-3.0.6.ebuild, metadata.xml:
+  Move to EPAI=4 and autotools-utils for conveniened handling of static-libs,
+  #398019
 
 *torque-3.0.6 (02 Nov 2012)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index fa78dc23125d..3235f3871afa 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -15,18 +15,18 @@ AUX torque-conf.d-munge 784 SHA256 7b8e47737211fd0d05dcc7938021ea5dbb1575010c530
 AUX torque-env.d 240 SHA256 d04eab3b1314645ee2014c718c4cf79ca74950dee1357d814b85c9faa5ef6002 SHA512 275ce5ccf9f138bcee504a9996c9d838cd34714d352d4b7ac2d631d0fca662bf38a2ef7e8745605d9b3847049015e0791c937340cfdacbf44800482ce73bb042 WHIRLPOOL b7cdc4d6752d00b315fb369f6382e1a6684c1cb8a3486545bd406270ed09811936c2735755fc01175fceed0422139e5d7d8dcd67868e2e40c8ebbb406c2eec57
 DIST torque-2.3.13.tar.gz 5466720 SHA256 18dcff32ae341281f83e0154f6e926583096ff57ec56626382b190dacc1c4054
 DIST torque-2.4.16.tar.gz 5705768 SHA256 48b1344e13baf974053dbd2faea3e2d24bb6ea8d785805d78623ae06747c0a0d SHA512 481d76b08f4d22704f858d490fd7cd1f8be2d41e2b5969df299c50f0acdf6a1763be2d0debb8a6bd77bd8b9747b9c3c666d701b2b75d8aaf150e10c1081c3be5 WHIRLPOOL 6e89a4e9ac3fd7fdf8b3d38568302a02bfb1aea0203786bade4bb03aaa2fda7f4bbfb2664be5d203d6984f5676980e77035140f41bf00065bd27e9acd38f227c
-DIST torque-2.5.9.tar.gz 5853931 SHA256 c68beb4b4e24042e4a8f4d84226e5d91aeb09a3d700d00f2c476559313597fe9
+DIST torque-2.5.9.tar.gz 5853931 SHA256 c68beb4b4e24042e4a8f4d84226e5d91aeb09a3d700d00f2c476559313597fe9 SHA512 b045f96d9a07d47f45254abd26f730b641725cd0ff10397e4514ce52b9dfa4c9d8141344062774c99903ebd26794a65616c166916b3904d20801a59a21b56b72 WHIRLPOOL 214ff277e5521baea83a3bbc06ad3900a4f3f0fbecacc736dc83ce51e7d24781a74bed07b8d80949e232a00995f77297ddda124edb01132f9aa806c53519dd65
 DIST torque-3.0.6.tar.gz 5888678 SHA256 f76736d780fc0f8ac73c54d586b4d15704e37cf191649b748b07f660186642b3 SHA512 6776302d797c718169daeb07efa31f77779d546ac6cf33edea98cd56ce800ab2547b55a8384a627f14d61abb7144b464a10a40936943b62bc4cc70823eec599f WHIRLPOOL 4950176f24e99e29d75d9808d5e223d90a2d0f1a36f7fc303506ef99e8012eb6c070a3674bbf3641c4e1dc3bbb87bb3670aa3a0ee1c957658c3f3d4c88fbb864
 EBUILD torque-2.3.13.ebuild 7761 SHA256 d628682ff14defd39cb4bd302bfc765b2355da5e1654c35e3290e1cd67c64df2 SHA512 c87f53e79cdee43c6cbf4f22521cb1a05d00d339423b10f237b9229f9474082f791f9670c885373040a850574e9909a05d69596f23959d1e8822643edd45997e WHIRLPOOL 6c5c84c5c769aa1043f618d6b1fa130ea33d10d410d3d9fc1aa9016f03275db3dbbd375f19128c60ca34bc5213fde67390b85f3133b75f0ee73ac101f1de6d9d
 EBUILD torque-2.4.16.ebuild 7693 SHA256 9d8237aa82be7bada391f7523d14077d84913a1edd02f7264a794d277a3dcc77 SHA512 168c0c04968436b73fb451e46955a19776c6eb2ca9c55f996cb4e2df7d72c6640e878ab887c660e1d1073d41dc83633ea14be33b5cb900de41e4d9a0a35359d0 WHIRLPOOL a4aeecb97453b01ea74d13b0128fa07d9aab500a8941a98a625c97dc0d364595fbc84fdf0d6890050bdea9ce6c709980c4d8fad29f7c65b121968c44399527a0
-EBUILD torque-2.5.9.ebuild 7361 SHA256 5b5475de517fe28b8648f2e08d3f99639c33449561d0ec7789e83a1a096e63d0 SHA512 6962d981763aae0e094971bd5c76b3de1d27cfc2e8bfa41f0b941452dc8e695a99e351c46746924b42d213eabc33f6b48f3428df47554455da25f3b7fca3dcf0 WHIRLPOOL 1a61afda2268852cb67e890ec42c29ef9bf2a6869937487886e4d312b917500e92f30ef47d7972fcbc4f5e1f634b67aebd8bee6fda0e32957452b2ec25bfa85e
-EBUILD torque-3.0.6.ebuild 7996 SHA256 d612e9d85898ec90e980cb8b622f85a8b1196f142073bddabac5b7801d1b6c55 SHA512 358611a129124b90bb8e175492f772e6ad4808ce8b340ee22465bd8afb5ab481c2497e3f31bdcd12171ebe87b44865300c6c9c9ea44cc7503e915aeb972ea75e WHIRLPOOL 59595b938b08208c0169278be775b37e88983afebde107e6bc1a8ef441da40cf5e10882cb78dcf5ad97c9127ea33ca3c8a961c14c1397eb9644e875ec9bb47bf
-MISC ChangeLog 23946 SHA256 ee57077d8841cfff56f5f4d99b61cc0713ff401ce750f95cf580a682f5b5aeae SHA512 43b0208575dab256d37b66601305bb8cf8331740d7a26f29392602e1f7413b7c2210f7c59b503fe9f10e9484435da16da89da84e0e89e158238783dbd7380fea WHIRLPOOL a1ec415b2ed36c9937de62b04eb75e2267a49e76567f2b10b0c8103d2f23d17ab5c433a6acc991a3a25d22f592ceedcc2c992e4fbce16185ac72ab0536d70f3e
-MISC metadata.xml 611 SHA256 80f22bc514020233d34ae83f25dd84b1696d053f0eeb32e924b55b8437ac1734 SHA512 e89dbbbee81da38856b73eccd1785fee2b0bd0a7527c6ed55819147050a2aa6bd7d4d8d1133da3d060a5956177dbe7233ff15e502b85a43fdda9774a3673c9a1 WHIRLPOOL 7f098de8484a034d9aca759fdd5de3e351e53493fcf4044e758a307db1cbb7887c9b1e1b25e9e4ff1ee8784e52f7431aa135987a9d4b24df39942816138aaa01
+EBUILD torque-2.5.9.ebuild 7273 SHA256 344785f01b4017000fdf7963386562dc9a535f1e20be4ae0b27d601908923409 SHA512 72186f4fdfb97cc089a28e1bd1ffa7ec66cf3efe0125257e4f8b63de5bab7fe435463512ad854263df20920c70089bddd8ccf60c62de9ca789a21b1ae677a630 WHIRLPOOL ae07cb51c80ed20ec8845dbeb74f8d79f666eb8863f5eae295e136a8ff7ab0a561757775a883548e6dbdc50c236070491c606929ebb40326d0fff657af13f083
+EBUILD torque-3.0.6.ebuild 7925 SHA256 5a82f1e7a2011f43e2f79059fde7b219f8d94b6d314e27cdd67ab0110b3a1726 SHA512 80ebdcd996cf61907adbb6a4ad229e22803fd082df4e52f97875a613b8699682dab83fcf7c1bf0411441edafba345e240cc650e6c85a9f9f58d351d420024131 WHIRLPOOL 072d453c8c6a6c2ec66a71cac14bf4e2c2ef6d41ce6a38fbcaf1bd237ee2168026466cecef0e9a33e61cef7a8ec8c0abaa04110babe7393d74ddf49076eea0fa
+MISC ChangeLog 24135 SHA256 8563dde033f06f11cf221f9cfb5ff44589f4ebbfcebc80e29e2c55851b015a67 SHA512 9be6196ead7e864c003494697f2e9c2cbae90be8d55d32fba7b0c3cb7a3418f06009d294feee2bf7998e171bf3aed11a4f413e209e69802bae30696ce75a7145 WHIRLPOOL af2b5f9d27a0007397dbd1926f529d2e7ab5ee6491d96a2c0e6da743c8d2da8177cc9b69e0773313354151bf970ea8e7f9cbc30501c782fd8ecfdbaad23505b1
+MISC metadata.xml 628 SHA256 10fab1886476e44fabbcda6e7dbbc8452d07cb0de0cefcf6e594312dfe89f7af SHA512 d1c78c4247f209eda60a61c9c611c4a4b87d52f85b112a78b96a4dee6f3cd660aef49547323074d69ffce8c1b916c3914f00282781e2f68f76658e6f9ac7ff9b WHIRLPOOL 243373e602f92a256118e6bee6c3071d5894caf3d53a663abee6929a310cf306b15a6a7bd2a0e76882cfe36cd4e8b6c06bb9e12f49f678d085883d61d4a84cf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCTY7IACgkQ4MrvBE1wQ8k3UQCePSHEo9JxHeFbMwzYxlZ1F4qd
-gAEAoKwRbG7Mvibir7tgpNtQL9MEQWTr
-=RmuX
+iEYEAREIAAYFAlDKAJMACgkQgAnW8HDreRb/+QCfXP5rfIVkrV2gYSies9sRkn85
+8aQAoJwHUubTlMxxVu7ZAK+zpWqZ5yXd
+=47EA
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index 91fec18cce0e..703f1e22fac4 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
-	<maintainer>
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name='cpusets'>Enable pbs_mom to utilize linux cpusets if available</flag>
-		<flag name='drmaa'>Enable the Distributed Resource Management Application API</flag>
-		<flag name='munge'>Enable authentication via munge</flag>
-		<flag name='nvidia'>Enable management of Nvidia GPUs</flag>
-		<flag name='server'>Enable compilation of pbs_server and pbs_sched</flag>
-	</use>
+  <herd>cluster</herd>
+  <maintainer>
+    <email>jsbronder@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="cpusets">Enable pbs_mom to utilize linux cpusets if available</flag>
+    <flag name="drmaa">Enable the Distributed Resource Management Application API</flag>
+    <flag name="munge">Enable authentication via munge</flag>
+    <flag name="nvidia">Enable management of Nvidia GPUs</flag>
+    <flag name="server">Enable compilation of pbs_server and pbs_sched</flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-cluster/torque/torque-2.5.9.ebuild b/sys-cluster/torque/torque-2.5.9.ebuild
index 3833ed82c1bf..542662f3b940 100644
--- a/sys-cluster/torque/torque-2.5.9.ebuild
+++ b/sys-cluster/torque/torque-2.5.9.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.9.ebuild,v 1.4 2012/03/07 02:21:39 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.9.ebuild,v 1.5 2012/12/13 16:21:38 jlec Exp $
 
-EAPI=2
-inherit flag-o-matic eutils linux-info
+EAPI=4
+
+inherit autotools-utils eutils flag-o-matic linux-info
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/torque.php"
@@ -13,7 +14,7 @@ LICENSE="torque-2.5"
 
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux munge server +syslog threads tk xml"
+IUSE="cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml"
 
 # ed is used by makedepend-sh
 DEPEND_COMMON="sys-libs/ncurses
@@ -31,6 +32,8 @@ RDEPEND="${DEPEND_COMMON}
 	crypt? ( net-misc/openssh )
 	!crypt? ( net-misc/netkit-rsh )"
 
+DOCS=( Release_Notes )
+
 pkg_setup() {
 	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
 
@@ -69,25 +72,26 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		$(use_enable drmaa) \
-		$(use_enable threads high-availability) \
-		$(use_enable xml server-xml) \
-		$(use_enable munge munge-auth) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		--with-tcp-retry-limit=2 \
-		${USE_CPUSETS} \
-		${myconf}
+	local myeconfargs=( --with-rcp=mom_rcp )
+
+	use crypt && myeconfargs+=( --with-rcp=scp )
+
+	myeconfargs+=(
+		$(use_enable tk gui)
+		$(use_enable syslog)
+		$(use_enable server)
+		$(use_enable drmaa)
+		$(use_enable threads high-availability)
+		$(use_enable xml server-xml)
+		$(use_enable munge munge-auth)
+		--with-server-home=${PBS_SERVER_HOME}
+		--with-environ=/etc/pbs_environment
+		--with-default-server=${PBS_SERVER_NAME}
+		--disable-gcc-warnings
+		--with-tcp-retry-limit=2
+		${USE_CPUSETS}
+		)
+	autotools-utils_src_configure
 }
 
 # WARNING
@@ -125,7 +129,7 @@ pbs_createspool() {
 		fi
 		# (#149226) If we're running in src_*, then keepdir
 		if [[ "${root}" = "${D}" ]]; then
-			keepdir ${d} || die
+			keepdir ${d}
 		fi
 	done
 }
@@ -134,12 +138,9 @@ src_install() {
 	# Make directories first
 	pbs_createspool "${D}"
 
-	emake DESTDIR="${D}" install || die "make install failed"
+	autotools-utils_src_install
 
-	dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-	fi
+	use doc && dodoc doc/admin_guide.ps doc/*.pdf
 
 	# The build script isn't alternative install location friendly,
 	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
@@ -149,12 +150,12 @@ src_install() {
 	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
-	newenvd "${FILESDIR}"/torque-env.d 25torque || die
+	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
+	newconfd "${FILESDIR}"/torque-conf.d-munge torque
+	newenvd "${FILESDIR}"/torque-env.d 25torque
 }
 
 pkg_preinst() {
@@ -179,7 +180,7 @@ 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}"
 }
 
@@ -214,14 +215,14 @@ pkg_config() {
 			rc=1
 		else
 			${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME} \
-			&& ${qmgr} "create queue batch" ${PBS_SERVER_NAME} \
-			&& ${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME} \
-			&& ${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME} \
-			&& ${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME} \
-			&& ${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME} \
-			&& ${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME} \
-			&& ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} \
-			|| die
+				&& ${qmgr} "create queue batch" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME} \
+				&& ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} \
+				|| die
 
 			"${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1
 
diff --git a/sys-cluster/torque/torque-3.0.6.ebuild b/sys-cluster/torque/torque-3.0.6.ebuild
index 126dfb368282..8688d2ca5eb9 100644
--- a/sys-cluster/torque/torque-3.0.6.ebuild
+++ b/sys-cluster/torque/torque-3.0.6.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.6.ebuild,v 1.1 2012/11/02 06:09:52 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.6.ebuild,v 1.2 2012/12/13 16:21:38 jlec Exp $
 
-EAPI=2
-inherit flag-o-matic eutils linux-info autotools
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic linux-info
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/torque.php"
@@ -13,7 +16,7 @@ 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 threads tk"
+IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server static-libs +syslog threads tk"
 
 # ed is used by makedepend-sh
 DEPEND_COMMON="sys-libs/ncurses
@@ -32,6 +35,8 @@ RDEPEND="${DEPEND_COMMON}
 	crypt? ( net-misc/openssh )
 	!crypt? ( net-misc/netkit-rsh )"
 
+DOCS=( Release_Notes )
+
 pkg_setup() {
 	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
 
@@ -73,29 +78,30 @@ src_prepare() {
 	# as-needed fix, libutils.a needs librt.
 	sed -i 's,^\(LDADD = .*\)$(MOMLIBS) $(PBS_LIBS),\1$(PBS_LIBS) $(MOMLIBS),' \
 		src/resmom/Makefile.am || die
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		$(use_enable drmaa) \
-		$(use_enable threads high-availability) \
-		$(use_enable munge munge-auth) \
-		$(use_enable nvidia nvidia-gpus) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		--with-tcp-retry-limit=2 \
-		${USE_CPUSETS} \
-		${myconf}
+	local myeconfargs=( --with-rcp=mom_rcp )
+
+	use crypt && myeconfargs+=( --with-rcp=scp )
+
+	myeconfargs+=(
+		$(use_enable tk gui)
+		$(use_enable syslog)
+		$(use_enable server)
+		$(use_enable drmaa)
+		$(use_enable threads high-availability)
+		$(use_enable munge munge-auth)
+		$(use_enable nvidia nvidia-gpus)
+		--with-server-home=${PBS_SERVER_HOME}
+		--with-environ=/etc/pbs_environment
+		--with-default-server=${PBS_SERVER_NAME}
+		--disable-gcc-warnings
+		--with-tcp-retry-limit=2
+		${USE_CPUSETS}
+		)
+	autotools-utils_src_configure
 }
 
 # WARNING
@@ -133,7 +139,7 @@ pbs_createspool() {
 		fi
 		# (#149226) If we're running in src_*, then keepdir
 		if [[ "${root}" = "${D}" ]]; then
-			keepdir ${d} || die
+			keepdir ${d}
 		fi
 	done
 }
@@ -142,12 +148,9 @@ src_install() {
 	# Make directories first
 	pbs_createspool "${D}"
 
-	emake DESTDIR="${D}" install || die "make install failed"
+	autotools-utils_src_install
 
-	dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-	fi
+	use doc && dodoc doc/admin_guide.ps doc/*.pdf
 
 	# The build script isn't alternative install location friendly,
 	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
@@ -157,12 +160,12 @@ src_install() {
 	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
-	newenvd "${FILESDIR}"/torque-env.d 25torque || die
+	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
+	newconfd "${FILESDIR}"/torque-conf.d-munge torque
+	newenvd "${FILESDIR}"/torque-env.d 25torque
 }
 
 pkg_preinst() {
@@ -187,7 +190,7 @@ 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}"
 	if use server; then
 		elog "    The format for the serverdb is now xml only.  If you do not want"