Do not use glibc rpc.h, #370771. Fix SRC_URI for 3.0.6-r1. Drop old.

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

8 files changed, 42 insertions, 259 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 8a498ac865f1..e6ca1f0c5797 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.153 2013/05/30 01:12:56 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.154 2013/06/01 19:49:33 jsbronder Exp $
+
+  01 Jun 2013; Justin Bronder <jsbronder@gentoo.org> torque-2.3.13.ebuild,
+  torque-2.4.16.ebuild, -torque-2.5.9-r1.ebuild, torque-2.5.12.ebuild,
+  torque-3.0.6-r1.ebuild, torque-4.1.5.1.ebuild:
+  Do not use glibc rpc.h, #370771. Fix SRC_URI for 3.0.6-r1. Drop old.
 
   30 May 2013; Justin Bronder <jsbronder@gentoo.org> torque-2.3.13.ebuild,
   torque-2.4.16.ebuild:
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 46cd6042d6e7..a3bd8e9d24c9 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -18,21 +18,19 @@ AUX trqauthd-init.d 594 SHA256 3f3d603e78a21acf88e96c7affc9bbf56ca8568ce17165d3a
 DIST torque-2.3.13.tar.gz 5466720 SHA256 18dcff32ae341281f83e0154f6e926583096ff57ec56626382b190dacc1c4054 SHA512 bdacdc318c1af11caf8f332008a0f492512b256cafc6974ecfc6ad94b2b971a7d8511392f45da1c0b000ab4078980b78f891dfb1ecd1567405d1ccd5bf118e10 WHIRLPOOL e9a006134f673cb4958534a6b08fdca1c7627491685277148a92c8eede19779aadc4447dfa11be31722136c5a689bb46205a803be060e1761ada293bbf034ab3
 DIST torque-2.4.16.tar.gz 5705768 SHA256 48b1344e13baf974053dbd2faea3e2d24bb6ea8d785805d78623ae06747c0a0d SHA512 481d76b08f4d22704f858d490fd7cd1f8be2d41e2b5969df299c50f0acdf6a1763be2d0debb8a6bd77bd8b9747b9c3c666d701b2b75d8aaf150e10c1081c3be5 WHIRLPOOL 6e89a4e9ac3fd7fdf8b3d38568302a02bfb1aea0203786bade4bb03aaa2fda7f4bbfb2664be5d203d6984f5676980e77035140f41bf00065bd27e9acd38f227c
 DIST torque-2.5.12.tar.gz 5862988 SHA256 436b4d84464e3be0538a4dc0a657b5ae113da6b429d449261e95e13a2a96316b SHA512 12615e412bf90b4248f76e28627ece21116969e4f009629598482ec4432a5e8b6b10ce695e3abc1e3ac43fa2325b5e04b176316ef3c21e4795cb610101f9afae WHIRLPOOL 57b636b34fd72967304babe11340852c0d06519d60705ac088483831b688517104a7ef064dd7b0375cfc35f093858754f65a9f4fd026a65ead85d0544323d682
-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
 DIST torque-4.1.5.1.tar.gz 6214726 SHA256 10fa10625256d26e9371abbc98ca8ecf307ccc2ef117e32a0bf806de105037dd SHA512 630b4a9c7d9d6b14bc807dfba868e78894856d24e7b10703c76b519edf78876e33ef158edd6dd8abeb3ffb6bfe8036e74eff23501d476ef9ebe817b46d2e3c5c WHIRLPOOL 6709a3eec73f39c27d4dd02ab62d74448a93a442bdf585d5f244142de8f54b42fdd841c773226589de4c3e0a9c881bdd51d4c04bf57235136086cab18dd6fa42
-EBUILD torque-2.3.13.ebuild 7795 SHA256 b4cb79438b2582509992e430af91ddbcf5c1ccad4630bd995fbaa00886d4b39b SHA512 41eae022a597892f4c7699806a498d2b65d5a892e79837b5adbc74df1b5a76b4bf35191b60987cf8c3e73f945127a5cc0ced649168c214765e3bc443ae9aa48c WHIRLPOOL 188462db6f561c93ef5a70eedb1c1db1f5211ee033be76ffa47c966c3431e8466ed3d1078b0aa2f95b13bd5458cb01870c3db26859a13708cc5262848507083b
-EBUILD torque-2.4.16.ebuild 7727 SHA256 f35b60730ae706f07b8dd405d51b5a1324f0458606b0b7dbbd2237e58d6e9e72 SHA512 b64ab4210066996109a3fd0cd90109b3ccf71f4554ef3328e3928b101c5aaea71c142adb1de6a04337cbab9f7dfe4455aa5a386a8004be4039f79b11f9b09474 WHIRLPOOL 5816cf992a4b5fe245b74d7c9dba12906a5dd334077310495df46afb190140eac09583f8c64d6595743aa89124bda16527feb81e0cf0128a24419d9874a4aed2
-EBUILD torque-2.5.12.ebuild 7471 SHA256 11296fc3eaee0c0898d77fd5c6e10622b366902b15fae0bf4faf9a6427d0f043 SHA512 a23f8002280f46315b898ef780870f5591cac37f654f300c654f2b9b577967c47e5463737d9e47d42db18907a2b920b3a7797fbcfdbac8187b539b1aa92c4b91 WHIRLPOOL 91335384e33e0cb00412aff7b6d2adb1bf9b8ecd5653df32db48287601d1add2e80de80ebc1dc0277dd6c05642c2ea3eb3cabf29a9a0fdbc803d60cb8a36ec65
-EBUILD torque-2.5.9-r1.ebuild 7357 SHA256 a0e820ef25d6321f8dc2ec0a2a2ef5c95cd0fc0fddbe30d7022011068451a146 SHA512 701831b41abf5479750619d37cca45097a0ba0417a3ac8ffa392b79cb63330b16f142ce300ebaf551500ab51a542dc26489298e78884fedc14ce2bec31ed8f5a WHIRLPOOL ec2afb461b4d0da686bdc1c78cf03a9041d975db5dfd81260f09f5cf9b2f411f781fa65ef97b3a8dccd4ffba44d98995ce7288b3f0d7a4bf748afda5639d25ac
-EBUILD torque-3.0.6-r1.ebuild 8040 SHA256 aefedb82a9d768ae180c64fe2cf6729d75bd168523e0aa2bae7885a4962200d7 SHA512 652a28fc574423a82777b4da162d92720184b3bbd955e509d66ac20bd475c9c3d740bd71c197844138a284f65a21273bef94a6ef42c8cd6b0b5031f9aded5f63 WHIRLPOOL 8da19b2bee68d22a3e2c87bd0ec23f9fe4f71e53d016db00f0124d3c066ad6656f1836146a5bcd0d78e1a96f93ee25cb0fab007f2c473dfd62aeb7b5cb5a2b8e
-EBUILD torque-4.1.5.1.ebuild 6853 SHA256 21a722da805b13b5fff0471b8d23b0fc9fe9bc352d11cabe1315d042b787d306 SHA512 7711123d8f1aac9b49de995b7e94832838efd368cc30b19907d89b84c6f41ab9f0911dde7b2228d69b099c301b05dfc14db1d0dfbaaa01692a93f41f09d1bc37 WHIRLPOOL e8fa4b5f818210e403b65d4c556ca54b081b6c242ac2f45cde6172e67ea9ace091c99d5f89356ea0dabed98f827da0ddb310352813edb8f6a1417ad85cfd5e65
-MISC ChangeLog 25894 SHA256 d3041dc695866132626e4b0105792e3227f00fda9ee52bc19ea0e91fbb43c5d9 SHA512 d9bf5035bc1ea1caedd3e710d997dce4bb7ac11c182b2857a21e7f113cbecbb8701fc9939a194e02919d5adab2042d7cfb0f27fe454eea64b40e1872be92458d WHIRLPOOL b92e0e8f67f9384e9dcd1f3342c031edf3f331aa8206bb388d3ca3dc4ae9e05ba4c24adea28f9cfe227d664f890b1ad0a5d4416be6f3c3d3196c4640ce289b14
+EBUILD torque-2.3.13.ebuild 7978 SHA256 0f46604b117cf49b79b22b7467c074da1b423ab45b0bca09acf9895739f91499 SHA512 2c40f53344a6138111c914b3a2145059ab76e83e9c98dd4970411f9c215c2abeef735e7cfb788658ef7f68a87e1ca11de7e63de4d076ce12de79890425d4a319 WHIRLPOOL 6194b7d86e3162c4cc32b247486c9692d9665595215a0536647b658ec43cee211a7cc4c63fccace98c9f5d2191fa1ea985bcc49818c23e732d4f1e10ddf9c24f
+EBUILD torque-2.4.16.ebuild 7910 SHA256 f3d655a519c10a2294a8e3a24e8dc7f80912584ec6ff53f1ac247faa664b465e SHA512 f11810cf13288de001e7a8f8c3f2bac53cf49448ef20eb56f40a41d7fadbaeee5cc84b966825a4b7c9cbfc764eef4606215308c5cd226a907ea32cf51a813d1c WHIRLPOOL 92e2e3334b00ec1a93ad772d66fc206d4141a6a8c368d8f3ed5d9a8bfbb48b43680be78f027270d4f47367682afc6e5bfdab08f9381da8f4311b63b4d4b45339
+EBUILD torque-2.5.12.ebuild 7585 SHA256 a662f828d4c06089e7a10ee7a299e498b60a4c6164e2ba954e4b10a25947b882 SHA512 a75cbe9ae95fd1d10144c1109278e19f974fde717db46ff1ec7687724dd0504a68053d1982558a32976aef64f1629006c2aae621f45a83e7ea04c2e36b376414 WHIRLPOOL 51a4d770c8a46544fc1a58b11632c50def6c14df29e5766109f39822de50257e1758417086f03e07f072819009500dd093e747b8c3d2171110527047735609d8
+EBUILD torque-3.0.6-r1.ebuild 8222 SHA256 91acb9a4fb2b8fa69517241061a6e9e6727394dde02c5f6a095a4cddce701c8f SHA512 740fcab54bea0726b7ee5f8de4a3646ed996a09b5a02f1e72f47a0cf8936009942d3b1c432d77efcfa8bb279d949f1b38172b8bff40cc31666f7420e9869d9dc WHIRLPOOL 9a906c3dbfeda37973357a7d221d56c87facb0e83e9aaa14b2cfc215e8762d4b092508b75ae509aad762fa28c21ae4ddc392642988f68a90abfa639a55a00e58
+EBUILD torque-4.1.5.1.ebuild 7036 SHA256 118b688cb2e307cf6d7f77a095f2decde3f8cdc3ffa5760811a5a90d644041e1 SHA512 f5523f26f71d8a9a01f6764b3cc6fb8596497166618c3a414892a7f130335bc1e0f54eeb8cff045dcff5e01d66a63ce1565842df1c10b81986c680c16cb39188 WHIRLPOOL 95302777fc5d4bc8342d146fbd038110b69d361d48b0ccc3770f57305321f81e59d18e42a7c0fa737cd46588cf5d31cf4e42dbc8d131e7b86968ff6c6c9d420e
+MISC ChangeLog 26161 SHA256 9713fee999ab12ce45f4aa0de1f9681650a3d111066efbe5180ea291f9db1e34 SHA512 5a2f8b039caa4f0033b761b7e7d9f100a950c026ac8c1b74327e419f8d75c2a847b3a88532bd98859e8b0e40978f7b4c691fcac6a3699c193b39abb69b2931f5 WHIRLPOOL 4a129c7f766e47a286de8077e19d028abcc7e9f72d7ea840447e7dedeb971827d1e774539aa90e42b1a26e221f3bec36fad89ba74793561819786edec5710536
 MISC metadata.xml 628 SHA256 10fab1886476e44fabbcda6e7dbbc8452d07cb0de0cefcf6e594312dfe89f7af SHA512 d1c78c4247f209eda60a61c9c611c4a4b87d52f85b112a78b96a4dee6f3cd660aef49547323074d69ffce8c1b916c3914f00282781e2f68f76658e6f9ac7ff9b WHIRLPOOL 243373e602f92a256118e6bee6c3071d5894caf3d53a663abee6929a310cf306b15a6a7bd2a0e76882cfe36cd4e8b6c06bb9e12f49f678d085883d61d4a84cf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAlGmp5kACgkQ4MrvBE1wQ8nEhgCdHSed7yxM9kZvU/UTcBI3VNqv
-xGEAn2GQCL55jdamCTnaHf9mDC+ep9je
-=63Rj
+iEUEAREIAAYFAlGqUF4ACgkQ4MrvBE1wQ8kxawCghLUUpYji6qDd0VF4u17rScFs
+85AAmKi/piqjmg7ho5uq+RN5M/8vfw4=
+=pB2M
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-2.3.13.ebuild b/sys-cluster/torque/torque-2.3.13.ebuild
index ba882fab0459..61ab4345ce57 100644
--- a/sys-cluster/torque/torque-2.3.13.ebuild
+++ b/sys-cluster/torque/torque-2.3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.13.ebuild,v 1.14 2013/05/30 01:12:56 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.13.ebuild,v 1.15 2013/06/01 19:49:33 jsbronder Exp $
 
 EAPI=2
 WANT_AUTOMAKE="1.12"
@@ -71,6 +71,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Unused and causes breakage when switching from glibc to tirpc.
+	# https://github.com/adaptivecomputing/torque/pull/148
+	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
+
 	epatch "${FILESDIR}"/0001-fix-parallel-doc-install.patch
 	epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch
 	epatch "${FILESDIR}"/0003-disable-automagic-doc-building.patch
diff --git a/sys-cluster/torque/torque-2.4.16.ebuild b/sys-cluster/torque/torque-2.4.16.ebuild
index ad1905f27694..b2b964bf545f 100644
--- a/sys-cluster/torque/torque-2.4.16.ebuild
+++ b/sys-cluster/torque/torque-2.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.16.ebuild,v 1.12 2013/05/30 01:12:56 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.16.ebuild,v 1.13 2013/06/01 19:49:33 jsbronder Exp $
 
 EAPI=2
 WANT_AUTOMAKE="1.12"
@@ -71,6 +71,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Unused and causes breakage when switching from glibc to tirpc.
+	# https://github.com/adaptivecomputing/torque/pull/148
+	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
+
 	epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch
 	epatch "${FILESDIR}"/disable-automagic-doc-building-2.4.14.patch
 
diff --git a/sys-cluster/torque/torque-2.5.12.ebuild b/sys-cluster/torque/torque-2.5.12.ebuild
index 5232dbc3a154..eb5697614d31 100644
--- a/sys-cluster/torque/torque-2.5.12.ebuild
+++ b/sys-cluster/torque/torque-2.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.12.ebuild,v 1.5 2013/05/30 00:53:30 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.12.ebuild,v 1.6 2013/06/01 19:49:33 jsbronder Exp $
 
 EAPI=4
 
@@ -75,10 +75,11 @@ pkg_setup() {
 	fi
 }
 
-#src_prepare() {
-#	append-cflags -DUSE_INTERP_RESULT
-#	autotools-utils_src_prepare
-#}
+src_prepare() {
+	# Unused and causes breakage when switching from glibc to tirpc.
+	# https://github.com/adaptivecomputing/torque/pull/148
+	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
+}
 
 src_configure() {
 	local myeconfargs=( --with-rcp=mom_rcp )
diff --git a/sys-cluster/torque/torque-2.5.9-r1.ebuild b/sys-cluster/torque/torque-2.5.9-r1.ebuild
deleted file mode 100644
index 77acd16d7e75..000000000000
--- a/sys-cluster/torque/torque-2.5.9-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2013 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-r1.ebuild,v 1.4 2013/05/30 00:53:30 jsbronder Exp $
-
-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/open-source/torque"
-SRC_URI="http://www.adaptivecomputing.com/resources/downloads/${PN}/${P}.tar.gz"
-
-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 static-libs +syslog threads tk xml"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="sys-libs/ncurses
-	sys-libs/readline
-	munge? ( sys-auth/munge )
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	sys-apps/ed
-	!sys-cluster/slurm"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-DOCS=( Release_Notes )
-
-PATCHES=( "${FILESDIR}"/tcl8.6.patch )
-
-pkg_setup() {
-	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
-
-	# Find a Torque server to use.  Check environment, then
-	# current setup (if any), and fall back on current hostname.
-	if [ -z "${PBS_SERVER_NAME}" ]; then
-		if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
-			PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
-		else
-			PBS_SERVER_NAME=$(hostname -f)
-		fi
-	fi
-
-	USE_CPUSETS="--disable-cpuset"
-	if use cpusets; then
-		if ! use kernel_linux; then
-			einfo
-			elog "    Torque currently only has support for cpusets in linux."
-			elog "Assuming you didn't really want this USE flag."
-			einfo
-		else
-			linux-info_pkg_setup
-			einfo
-			elog "    Torque support for cpusets is still in development, you may"
-			elog "wish to disable it for production use."
-			einfo
-			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
-				einfo
-				elog "    Torque support for cpusets will require that you recompile"
-				elog "your kernel with CONFIG_CPUSETS enabled."
-				einfo
-			fi
-			USE_CPUSETS="--enable-cpuset"
-		fi
-	fi
-}
-
-src_configure() {
-	local myeconfargs=( --with-rcp=mom_rcp )
-
-	use crypt && myeconfargs=( --with-rcp=scp )
-
-	myeconfargs+=(
-		$(use_enable tk gui)
-		$(use_enable tk tcl-qstat)
-		$(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
-# OpenPBS is extremely stubborn about directory permissions. Sometimes it will
-# just fall over with the error message, but in some spots it will just ignore
-# you and fail strangely. Likewise it also barfs on our .keep files!
-pbs_createspool() {
-	local root="$1"
-	local s="$(dirname "${PBS_SERVER_HOME}")"
-	local h="${PBS_SERVER_HOME}"
-	local sp="${h}/server_priv"
-	einfo "Building spool directory under ${D}${h}"
-	local a d m
-	local dir_spec="
-			0755:${h}/aux 0700:${h}/checkpoint
-			0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs
-			1777:${h}/spool 1777:${h}/undelivered"
-
-	if use server; then
-		dir_spec="${dir_spec} 0755:${h}/sched_logs
-			0755:${h}/sched_priv/accounting 0755:${h}/server_logs
-			0750:${h}/server_priv 0755:${h}/server_priv/accounting
-			0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts
-			0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users
-			0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues"
-	fi
-
-	for a in ${dir_spec}; do
-		d="${a/*:}"
-		m="${a/:*}"
-		if [[ ! -d "${root}${d}" ]]; then
-			install -d -m${m} "${root}${d}" || die
-		else
-			chmod ${m} "${root}${d}" || die
-		fi
-		# (#149226) If we're running in src_*, then keepdir
-		if [[ "${root}" = "${D}" ]]; then
-			keepdir ${d}
-		fi
-	done
-}
-
-src_install() {
-	# Make directories first
-	pbs_createspool "${D}"
-
-	autotools-utils_src_install
-
-	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
-	for file in `find "${D}" -iname tclIndex`; do
-		sed -e "s/${D//\// }/ /" "${file}" > "${file}.new"
-		mv "${file}.new" "${file}" || die
-	done
-
-	if use server; then
-		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
-	newconfd "${FILESDIR}"/torque-conf.d-munge torque
-	newenvd "${FILESDIR}"/torque-env.d 25torque
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die
-	fi
-
-	echo "${PBS_SERVER_NAME}" > "${D}${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
-
-	if use munge; then
-		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/torque || die
-	fi
-}
-
-pkg_postinst() {
-	pbs_createspool "${ROOT}"
-	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}"
-}
-
-# root will be setup as the primary operator/manager, the local machine
-# will be added as a node and we'll create a simple queue, batch.
-pkg_config() {
-	local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	einfo "Using ${h} as the pbs homedir"
-	einfo "Using ${PBS_SERVER_NAME} as the pbs_server"
-
-	# Check for previous configuration and bail if found.
-	if [ -e "${h}/server_priv/acl_svr/operators" ] \
-		|| [ -e "${h}/server_priv/nodes" ] \
-		|| [ -e "${h}/mom_priv/config" ]; then
-		ewarn "Previous Torque configuration detected.  Press Enter to"
-		ewarn "continue or Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" || die
-	echo "\$logevent 255" >> "${h}/mom_priv/config" || die
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		# pbs_server bails on repeated backslashes.
-		if ! "${ROOT}"/usr/sbin/pbs_server -f -d "${h}" -t create; then
-			eerror "Failed to start pbs_server"
-			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
-
-			"${ROOT}"/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
-		fi
-	fi
-	eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-3.0.6-r1.ebuild b/sys-cluster/torque/torque-3.0.6-r1.ebuild
index d153dcda9462..f0ec64526468 100644
--- a/sys-cluster/torque/torque-3.0.6-r1.ebuild
+++ b/sys-cluster/torque/torque-3.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.5 2013/05/30 00:53:30 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.6-r1.ebuild,v 1.6 2013/06/01 19:49:33 jsbronder Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit autotools-utils flag-o-matic linux-info
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-SRC_URI="http://www.adaptivecomputing.com/resources/downloads/${PN}/${P}.tar.gz"
+SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=190 -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="torque-2.5"
@@ -79,6 +79,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Unused and causes breakage when switching from glibc to tirpc.
+	# https://github.com/adaptivecomputing/torque/pull/148
+	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
+
 	# as-needed fix, libutils.a needs librt.
 	sed -i 's,^\(LDADD = .*\)$(MOMLIBS) $(PBS_LIBS),\1$(PBS_LIBS) $(MOMLIBS),' \
 		src/resmom/Makefile.am || die
diff --git a/sys-cluster/torque/torque-4.1.5.1.ebuild b/sys-cluster/torque/torque-4.1.5.1.ebuild
index b217f1977627..bb5f4ace0e8f 100644
--- a/sys-cluster/torque/torque-4.1.5.1.ebuild
+++ b/sys-cluster/torque/torque-4.1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1.ebuild,v 1.2 2013/05/30 00:53:30 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1.ebuild,v 1.3 2013/06/01 19:49:33 jsbronder Exp $
 
 EAPI=2
 inherit flag-o-matic eutils linux-info
@@ -66,6 +66,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Unused and causes breakage when switching from glibc to tirpc.
+	# https://github.com/adaptivecomputing/torque/pull/148
+	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
+
 	# We install to a valid location, no need to muck with ld.so.conf
 	# --without-loadlibfile is supposed to do this for us...
 	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die