Cleanup old torque versions.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

16 files changed, 22 insertions, 2094 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 4f9cb098dbde..0aa0b2d61273 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.82 2009/03/18 18:17:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.83 2009/03/19 16:12:42 jsbronder Exp $
+
+  19 Mar 2009; Justin Bronder <jsbronder@gentoo.org>
+  -files/pbs_mom-init.d-2.2.1, -files/pbs_sched-init.d-2.2.1,
+  -files/pbs_server-init.d-2.2.1, -files/torque-conf.d-2.2.1,
+  -files/torque-env.d-2.2.1, -files/torque-2.3-fixes-r2221-2227.patch,
+  -files/2.3.0-fixes_r2031.patch, -files/torque-setuid-safety.patch,
+  -files/torque-setuid-safety-am.patch, -torque-2.2.1-r2.ebuild,
+  -torque-2.3.0-r1.ebuild, -torque-2.3.1.ebuild, -torque-2.3.2.ebuild,
+  -torque-2.3.3.ebuild:
+  Cleanup old torque versions.
 
   18 Mar 2009; Brent Baude <ranger@gentoo.org> torque-2.3.6.ebuild:
   stable ppc, bug 259857
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 0a02fb8b3b4b..c7a64cdbf194 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,28 +1,19 @@
-AUX 2.3.0-fixes_r2031.patch 8484 RMD160 58429355795ed3304c986b7b667d86486bb1c8cf SHA1 2a47b277277fcfc97a26ccad7c967c9f8bf72932 SHA256 9f847cc8273b2b227d7163299ea856830c4d333527e1566b13e989d980866398
-AUX pbs_mom-init.d-2.2.1 1003 RMD160 97be9b485fabd022ff209c910ae3974a73ebbc30 SHA1 cf50bac5a12a07535104ff7f7dcdfd054c995b2b SHA256 ef010854efc7a5c310c34bc53d1d927b7928bfa0d48bb5d8ae76bd3453f37a25
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pbs_mom-init.d-2.2.1-r1 1093 RMD160 ade6389bcda7974fd17c56c5f6f7a1c5b19c7fda SHA1 051455da4526b908ddb2346c912b68ba22245209 SHA256 ce5dfb1db62de8611974dcf15698dce75ef289f2a13d6a95039aec724748e64d
-AUX pbs_sched-init.d-2.2.1 1084 RMD160 a4f8b42dc5e004cbd9f8168cc39520d8bc1168d6 SHA1 57a9cb58ec8def6f3f51d7f76cf38c6375549fa1 SHA256 6efcf1b9f8f0f99599dacab686ce1e53b8202574d1a2ad7b138d1451cd466000
 AUX pbs_sched-init.d-2.2.1-r1 1174 RMD160 d39789a7675487065094083c1ebb6da6e8246818 SHA1 c550cd7606da18a74e736c7f0d26d04deea3d34b SHA256 b1edba8149cc3962e147d8e16148113ad629c5c7ab54ea629d5c106aea337afe
-AUX pbs_server-init.d-2.2.1 1576 RMD160 f57eeea595c8d609346c0d0d4645decfab76cb5c SHA1 90ad4ff42cac937929bde4cbcf7f69460c2f630e SHA256 43a1ea111ca161d8bd496291a28fe3201e9080b97d3c746a29d820ec2cfbd9d7
 AUX pbs_server-init.d-2.2.1-r1 1666 RMD160 e757d58142dd2abc10cee6e016744336788bca5c SHA1 f1f0a3181265e7a0c0e59cfb51c53dfaf4f93dd8 SHA256 a7e05fa7b544b46d8e8a6fc2ed4fc843dd63496597fcd32a70f45c4ddcec18d3
-AUX torque-2.3-fixes-r2221-2227.patch 11583 RMD160 c9034c6ac160565837ce1d6a7ae847f9d5db7565 SHA1 d5b8cccefb50e1cbee4c57df86b78e569767bb3a SHA256 46907789798266695efbcb584bcae898be6f76554f68c42d9a3974b4c4ac6f5d
-AUX torque-conf.d-2.2.1 816 RMD160 8bd7fd0c6566445c761da96859d86fbdb11d40f9 SHA1 da49ef33b73cab88c37bea20d26361c7a69cfb12 SHA256 ed982717cb8334a0a43e8807166bc10b5cbf39848e5729b321e946b31fa1c0c1
 AUX torque-conf.d-2.2.1-r1 649 RMD160 d8a8cec80a86fdea54545d64df9276db0386d688 SHA1 115fc52661a003b69be2dfb716e29f8d86461ca3 SHA256 4139da44a55dbcb4a8227fd0aedede8e091971fd63c0e08644712f4a91e7b174
-AUX torque-env.d-2.2.1 337 RMD160 bb5341d647e6c4545077783dd2aa4135662276f8 SHA1 10910a42d419e552c42a098010d8360b496f7f72 SHA256 0c5abf36209d684e7c4f82749f6c06ad976f7c1f3f0e94731b42c1d1331c5bed
 AUX torque-env.d-2.2.1-r1 260 RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 SHA1 85ad40b92ec2573aae1536aa35995ca3d7deb222 SHA256 3f1c12897f3a5993a634da35a069360b0069ad189309175a0276d32b06b2d67a
-AUX torque-setuid-safety-am.patch 546 RMD160 726578c77ebbc6a83ed8a258c31452c296109e6d SHA1 bd4ce2de39e3288c3fdd5bfad64f54e33c63ccdc SHA256 81c59eaa06eab86e684d21e7ec9d15b331473194ee1e367450816f6e0fd09bfb
-AUX torque-setuid-safety.patch 1020 RMD160 199a8d543c6f0de0934211ca248b637f61f1a0d0 SHA1 9a5d8d9aa6cc14a1be120f506a38b0910c9bfc16 SHA256 0770e6d88889224db2718c93846a55e1d17b6a457cbb2e80cd9d9e22a8d85e33
-DIST torque-2.2.1.tar.gz 5370260 RMD160 219e5a4234a1bbf0241c15f568a720752e48587c SHA1 fafa9d66aa8bf8daa9e8f660903aa1105ff14bda SHA256 6d2674d471e300df6ebda56ef80c2a7be0de33fc619f98ee78eee69af1d179b8
-DIST torque-2.3.0.tar.gz 5419629 RMD160 7dd4885cda583aa8ba16dce7b9001c009f264881 SHA1 e600b121aa6dae8e872935907311913cf8631d75 SHA256 eb5e694b6acdfe84249dfdf71552cb38d26e29fcda7ba09574b041e06290ec57
-DIST torque-2.3.1.tar.gz 5447820 RMD160 c4152ff383940965cd77274e4f94a0350f8fb87e SHA1 0fa5729f55fd309dde6b8163375e8968ca9cae89 SHA256 5f628c19155c2c5d2bb3cc45276637b80652304ea8c918c20b0d8591c02ac970
-DIST torque-2.3.2.tar.gz 5449890 RMD160 e3008e298c2a15d4462f00cd2759eea1561aad75 SHA1 d0f310524de0bdc25b88923da1170d9829c15072 SHA256 d87ce913a3ce3b78b6938a799c41d014d8f9da3c936587014e0e310012bdfb7e
-DIST torque-2.3.3.tar.gz 5460551 RMD160 bacd094e468466d8560950c96bb83a0b23136d53 SHA1 383cdad21591ff710ef51f28ccb667c00ccd6466 SHA256 70b100ee3c295300fb473ca77e40146c6c54685df9c1eb841b6fcd74a5193930
 DIST torque-2.3.6.tar.gz 5447812 RMD160 c56c50eb6c060485ccd843a2595aa6952e465681 SHA1 43420cca1a6dcb22fb246b8b44501eed7ac5649b SHA256 95cdc2d4c61fef867caffcb20e41e614b9f8b0f4bc9d0a618546a885dd259dd3
-EBUILD torque-2.2.1-r2.ebuild 7202 RMD160 1bf67f7e5a7d2bd813ceca38739a873ac36c35d4 SHA1 37e2c5bd0c6bb3fcc90f8869a6eae0b299448dd5 SHA256 113a0e6629f1e7208b55edb7760f3ae8127f5ca4f3d8dea24cd10188a222e363
-EBUILD torque-2.3.0-r1.ebuild 7297 RMD160 15b48329b60b13a98162667dce535aa16a3ff432 SHA1 6246b748f2186676152dcd7d207ec774741d5d22 SHA256 250027357f887beedcfe26300d615ba49289b7fb2ce55834ca9b091a25a41b70
-EBUILD torque-2.3.1.ebuild 7366 RMD160 ef298bcbd05f92af2ff81ec0b9773bcace74347f SHA1 076151dd206f6b716b53647978e979f7f41218db SHA256 a37911c5d9d2b3e3407165f1cc3fbee400dee9b3424c6bde66b552bd0547bb39
-EBUILD torque-2.3.2.ebuild 7094 RMD160 41a306bba393544de9894749e7875a7cd7799b2b SHA1 adca84d1d0fdebf81858fae5b0cd41326433c7f7 SHA256 aa7fd02cfd38cfc131de441c5ae768f6fe5d119b32b4081657ecfd307698c008
-EBUILD torque-2.3.3.ebuild 7117 RMD160 87e25bd3ee3b57ccd009186dabfafbe44f25791a SHA1 dd43455831cf1ad6e294d6fa68dd170f87205ffb SHA256 667f96a9d46ed9fe7b1434d498cebfd8f5a22b16fc71dd66b723678908802f06
 EBUILD torque-2.3.6.ebuild 7106 RMD160 5795827fa5aad846f2ea4cfd2227a49d27f84d8d SHA1 39bf019c0b9098b916b8225fadab43c490b113f5 SHA256 302b60dbbb17d8bec29ae12b3e4d7a32c7e443b7bb5ac627b9f00b8a169a0a7e
-MISC ChangeLog 13964 RMD160 d45e71e6872fb3846479653a9758ca80bcd3964a SHA1 0547d7b39c0c67e048120ccbfbaa79f48375d17e SHA256 d4a26856211efb9d916b59cae67688021116bebb1f68a1fa3674c06c2dd87bb7
+MISC ChangeLog 14476 RMD160 c9417e11bc73042b5f0c8a37a66a136214d9c0e6 SHA1 be6aceff1a4ee9a4d4b0d22a15f95916d4e20251 SHA256 dda1d25f6435c6edc0446058ac0b1d7b8066c28f3c8930b097a6d17997515650
 MISC metadata.xml 408 RMD160 2e54db44d11d613a63e03b54fcf813e78a3a82ab SHA1 fa42ab203f728c413b11f5011b5023b81e8c1d6f SHA256 ab9c6a8648593628730cff1018cdb2e5a898f68a1df9902d68ca6fafb771b960
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAknCbv8ACgkQ4MrvBE1wQ8ni5QCfZn4OmGmXOdcepPvi3mH+7/n5
+eukAn3wAhY65PufgXsOy22Iz+eFLP7p1
+=Av0R
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/files/2.3.0-fixes_r2031.patch b/sys-cluster/torque/files/2.3.0-fixes_r2031.patch
deleted file mode 100644
index 499a5e2e5b37..000000000000
--- a/sys-cluster/torque/files/2.3.0-fixes_r2031.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-Index: CHANGELOG
-===================================================================
---- CHANGELOG	(revision 2013)
-+++ CHANGELOG	(revision 2032)
-@@ -1,5 +1,9 @@
- c - crash     b - bug fix    e - enhancement    f - new feature
- 
-+2.3.1
-+  b - fixed memory leak in free_br for PBS_BATCH_MvJobFile case
-+  e - torque can now compile on Linux and OS X with NDEBUG defined 
-+
- 2.3.0
-   e - redesign how torque.spec is built
-   e - added -a to qrun to allow asynchronous job start
-Index: src/resmom/start_exec.c
-===================================================================
---- src/resmom/start_exec.c	(revision 2013)
-+++ src/resmom/start_exec.c	(revision 2032)
-@@ -3313,16 +3313,18 @@
- 
-   if (strlen(shell) == 0)
-     {
-+#ifndef NDEBUG
-     extern char mom_host[];
--
-+#endif
-     DBPRT(("user \"%s\" may not have a shell defined on node \"%s\"\n",
-       pwdp->pw_name,
-       mom_host));
-     }
-   else if (strstr(shell,"/bin/false") != NULL)
-     {
-+#ifndef NDEBUG
-     extern char mom_host[];
--
-+#endif
-     DBPRT(("user \"%s\" has shell \"/bin/false\" on node \"%s\"\n",
-       pwdp->pw_name,
-       mom_host));
-Index: src/resmom/requests.c
-===================================================================
---- src/resmom/requests.c	(revision 2013)
-+++ src/resmom/requests.c	(revision 2032)
-@@ -1479,8 +1479,9 @@
-   int  signum)
- 
-   {
-+#ifndef NDEBUG
-   char      id[] = "sigalltasks_sisters";
--
-+#endif
-   char     *cookie;
-   eventent *ep;
-   int i;
-Index: src/resmom/mom_main.c
-===================================================================
---- src/resmom/mom_main.c	(revision 2013)
-+++ src/resmom/mom_main.c	(revision 2032)
-@@ -4884,8 +4884,9 @@
-   int fd)
- 
-   {
-+#ifndef NDEBUG
-   static char id[] = "do_tcp";
--
-+#endif
-   int ret, proto, version;
-   int tm_request A_((int stream, int version));
- 
-Index: src/resmom/darwin/mom_mach.c
-===================================================================
---- src/resmom/darwin/mom_mach.c	(revision 2013)
-+++ src/resmom/darwin/mom_mach.c	(revision 2032)
-@@ -400,7 +400,9 @@
-   job *pjob)
- 
-   {
-+#ifndef NDEBUG
-   static char id[] = "cput_sum";
-+#endif
-   int         i;
-   u_long      cputime;
-   int         nps = 0;
-@@ -480,7 +482,9 @@
-   job *pjob)  /* I */
- 
-   {
-+#ifndef NDEBUG
-   char         *id = "mem_sum";
-+#endif
-   int           i;
-   unsigned long memsize = 0;
- 
-@@ -527,7 +531,9 @@
-   job *pjob)
- 
-   {
-+#ifndef NDEBUG
-   char          *id = "resi_sum";
-+#endif
-   int		 i;
-   unsigned long	 memsize = 0;
- 
-@@ -658,7 +664,9 @@
-     job			*pjob;
-     int			 set_mode;	/* SET_LIMIT_SET or SET_LIMIT_ALTER */
- {
-+#ifndef NDEBUG
- 	char		*id = "mom_set_limits";
-+#endif
- 	char		*pname;
- 	int		retval;
- 	unsigned long	value;	/* place in which to build resource value */
-@@ -777,7 +785,9 @@
-   
-   job *pjob)
-   {
-+#ifndef NDEBUG
-   char		*id = "mom_do_poll";
-+#endif
-   char		*pname;
-   resource	*pres;
- 
-@@ -820,7 +830,9 @@
- int mom_open_poll()
- 
-   {
-+#ifndef NDEBUG
-   char *id = "mom_open_poll";
-+#endif 
- 
-   DBPRT(("%s: entered\n", 
-     id))
-@@ -1032,7 +1044,9 @@
-   job *pjob)
- 
-   {
-+#ifndef NDEBUG
-   char		*id = "mom_over_limit";
-+#endif
-   char		*pname;
-   int		retval;
-   unsigned long	value, num;
-@@ -1416,7 +1430,9 @@
-   pid_t jobid)
- 
-   {
-+#ifndef NDEBUG
-   char			*id = "cput_job";
-+#endif
-   int			i;
-   unsigned long		cputime;
-   time_value_t   total_time;
-@@ -1487,7 +1503,9 @@
-   pid_t pid)
- 
-   {
-+#ifndef NDEBUG
-   char		*id = "cput_proc";
-+#endif
-   uint		cputime;
-   int           i;
-   time_value_t   total_time;
-@@ -1597,7 +1615,9 @@
-   pid_t jobid)
- 
-   {
-+#ifndef NDEBUG
-   char *id = "mem_job";
-+#endif
-   int   i;
-   int   memsize, addmem;
-   int   found = 0;
-Index: src/resmom/darwin/mom_start.c
-===================================================================
---- src/resmom/darwin/mom_start.c	(revision 2013)
-+++ src/resmom/darwin/mom_start.c	(revision 2032)
-@@ -188,7 +188,9 @@
- 
- void scan_for_terminated()
- {
-+#ifndef NDEBUG
- 	static	char	id[] = "scan_for_terminated";
-+#endif
- 	int		exiteval;
- 	pid_t		pid;
- 	job		*pjob;
-Index: src/resmom/mom_inter.c
-===================================================================
---- src/resmom/mom_inter.c	(revision 2013)
-+++ src/resmom/mom_inter.c	(revision 2032)
-@@ -581,8 +581,9 @@
- #ifdef IPV6_V6ONLY      
-                         if (ai->ai_family == AF_INET6) {
-                                 int on = 1;
--                                if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0)
-+                                if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) {
-                                         DBPRT(("setsockopt IPV6_V6ONLY: %.100s\n", strerror(errno)));
-+                                }
-                         }
- #endif                  
-                         if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
-Index: src/server/node_func.c
-===================================================================
---- src/server/node_func.c	(revision 2013)
-+++ src/server/node_func.c	(revision 2032)
-@@ -1132,7 +1132,9 @@
- int update_nodes_file()
- 
-   {
-+#ifndef NDEBUG
-   static char	id[] = "update_nodes_file";
-+#endif
-   struct pbsnode  *np;
-   int	i, j;
-   FILE	*nin;
-Index: src/server/req_movejob.c
-===================================================================
---- src/server/req_movejob.c	(revision 2013)
-+++ src/server/req_movejob.c	(revision 2032)
-@@ -121,7 +121,9 @@
-   struct batch_request *req)
- 
-   {
-+#ifndef NDEBUG
-   char	*id = "req_movejob";
-+#endif
-   job	*jobp;
- 
-   jobp = chk_job_request(req->rq_ind.rq_move.rq_jid,req);
-@@ -220,7 +222,9 @@
-   struct batch_request *req)  /* I */
- 
-   {
-+#ifndef NDEBUG
-   char	*id = "req_orderjob";
-+#endif
-   job	*pjob;
-   job	*pjob1;
-   job	*pjob2;
-Index: src/server/node_manager.c
-===================================================================
---- src/server/node_manager.c	(revision 2013)
-+++ src/server/node_manager.c	(revision 2032)
-@@ -2130,7 +2130,9 @@
-  */
- int write_node_note()
-   {
-+#ifndef NDEBUG
-   static char id[] = "write_node_note";
-+#endif
-   struct pbsnode *np;
-   int	i;
-   FILE	*nin;
-Index: src/server/process_request.c
-===================================================================
---- src/server/process_request.c	(revision 2013)
-+++ src/server/process_request.c	(revision 2032)
-@@ -1080,11 +1080,7 @@
- 
-       break;
- 
--    /* CRI RT #255 reports a memory leak at this point, but I can't
--     * reproduce it, so I'm just leaving this here for now */
-     case PBS_BATCH_MvJobFile:
--      log_err(-1,"free_br","BUG: NOT freeing from PBS_BATCH_MvJobFile");
--      break; 
-     case PBS_BATCH_jobscript:
- 
-       if (preq->rq_ind.rq_jobfile.rq_data)
-Index: src/lib/Libattr/attr_fn_resc.c
-===================================================================
---- src/lib/Libattr/attr_fn_resc.c	(revision 2013)
-+++ src/lib/Libattr/attr_fn_resc.c	(revision 2032)
-@@ -81,9 +81,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <memory.h>
--#ifndef NDEBUG
- #include <stdio.h>
--#endif
- #include <stdlib.h>
- #include <string.h>
- #include "pbs_ifl.h"
-Index: src/lib/Libattr/attr_node_func.c
-===================================================================
---- src/lib/Libattr/attr_node_func.c	(revision 2013)
-+++ src/lib/Libattr/attr_node_func.c	(revision 2032)
-@@ -82,9 +82,7 @@
- #include <sys/types.h>
- #include <ctype.h>
- #include <memory.h>
--#ifndef NDEBUG
- #include <stdio.h>
--#endif
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
-Index: src/lib/Libifl/tcp_dis.c
-===================================================================
---- src/lib/Libifl/tcp_dis.c	(revision 2013)
-+++ src/lib/Libifl/tcp_dis.c	(revision 2032)
-@@ -587,8 +587,9 @@
-   size_t      ct)  /* I */
- 
-   {
-+#ifndef NDEBUG
-   char *id = "tcp_puts";
--
-+#endif
-   struct tcpdisbuf *tp;
- 
-   tp = &tcparray[fd]->writebuf;
-Index: src/lib/Libifl/list_link.c
-===================================================================
---- src/lib/Libifl/list_link.c	(revision 2013)
-+++ src/lib/Libifl/list_link.c	(revision 2032)
-@@ -81,10 +81,8 @@
- 
- #include "portability.h"
- #include "list_link.h"
--#ifndef NDEBUG
- #include <stdio.h>
- #include <stdlib.h>
--#endif
- 
- 
- /*
-Index: src/lib/Libnet/rm.c
-===================================================================
---- src/lib/Libnet/rm.c	(revision 2013)
-+++ src/lib/Libnet/rm.c	(revision 2032)
-@@ -998,7 +998,9 @@
- int activereq(void)
- 
-   {
-+#ifndef NDEBUG
-   static char	id[] = "activereq";
-+#endif
- 
- #if RPP
-   struct out *op;
diff --git a/sys-cluster/torque/files/pbs_mom-init.d-2.2.1 b/sys-cluster/torque/files/pbs_mom-init.d-2.2.1
deleted file mode 100644
index 758134656e6f..000000000000
--- a/sys-cluster/torque/files/pbs_mom-init.d-2.2.1
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-. /etc/conf.d/torque 
-
-depend() {
-    need net
-    after pbs_server
-    after pbs_sched
-    after logger
-}
-
-checkconfig() {
-    for i in "server_name" "mom_priv/config"; do
-        if [ ! -e ${PBS_SERVER_HOME}/${i} ]; then
-            eerror "Missing config file ${PBS_SERVER_HOME}/${i}"
-            return 1
-        fi
-    done
-}
-
-start() {
-    checkconfig || return 1
-
-    ebegin "Starting Torque pbs_mom"
-    local extra_args=""
-    if [ -n "${PBS_MOM_LOG}" ]; then
-        extra_args="-- -L ${PBS_MOM_LOG}"
-    fi
-    start-stop-daemon  --start -p ${PBS_SERVER_HOME}/mom_priv/mom.lock \
-        --exec /usr/sbin/pbs_mom ${extra_args}
-    eend ${?}		
-}
-
-stop() {
-    ebegin "Stopping Torque pbs_mom"
-    /usr/sbin/momctl -s  || start-stop-daemon --stop -p ${PBS_SERVER_HOME}/mom_priv/mom.lock
-    eend ${?}
-}
-
-restart() {
-    svc_stop
-    sleep 3
-    svc_start
-}
-# vim:ts=4
diff --git a/sys-cluster/torque/files/pbs_sched-init.d-2.2.1 b/sys-cluster/torque/files/pbs_sched-init.d-2.2.1
deleted file mode 100644
index b882732cb9b2..000000000000
--- a/sys-cluster/torque/files/pbs_sched-init.d-2.2.1
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-. /etc/conf.d/torque 
-
-depend() {
-    need net
-    after pbs_server
-    before pbs_mom
-    after logger
-}
-
-checkconfig() {
-    for i in "server_name"; do
-        if [ ! -e ${PBS_SERVER_HOME}/${i} ]; then
-            eerror "Missing config file ${PBS_SERVER_HOME}/${i}"
-            return 1
-        fi
-    done
-
-    if [ -z "$(grep 'queue_type' ${PBS_SERVER_HOME}/server_priv/queues/*)" ]; then
-        eerror "No queues have been defined yet."
-        return 1
-    fi
-}
-
-start() {
-    checkconfig || return 1
-	
-    ebegin "Starting Torque pbs_sched"
-    local extra_args=""
-    if [ -n "${PBS_SCHED_LOG}" ]; then
-        extra_args="-- -L ${PBS_SCHED_LOG}"
-    fi
-
-    start-stop-daemon  --start -p ${PBS_SERVER_HOME}/sched_priv/sched.lock \
-        --exec /usr/sbin/pbs_sched ${extra_args}
-    eend ${?}		
-}
-
-stop() {
-    ebegin "Stopping Torque pbs_sched"
-    start-stop-daemon --stop -p ${PBS_SERVER_HOME}/sched_priv/sched.lock
-    eend ${?}
-}
-# vim:ts=4
diff --git a/sys-cluster/torque/files/pbs_server-init.d-2.2.1 b/sys-cluster/torque/files/pbs_server-init.d-2.2.1
deleted file mode 100644
index 6d2cbf3cf614..000000000000
--- a/sys-cluster/torque/files/pbs_server-init.d-2.2.1
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-. /etc/conf.d/torque 
-
-depend() {
-    need net
-    before pbs_sched
-    before pbs_mom
-    after logger
-}
-
-checkconfig() {
-    for i in "server_name" "server_priv/nodes"; do
-        if [ ! -e "${PBS_SERVER_HOME}/${i}" ]; then
-            eerror "Missing config file ${PBS_SERVER_HOME}/${i}"
-            return 1
-        fi
-    done
-
-    for i in "acl_svr/operators" "serverdb"; do
-        if [ ! -e "${PBS_SERVER_HOME}/server_priv/${i}" ]; then
-            eerror "Torque has not been fully configured to run."
-            eerror "Missing ${i}"
-            return 1
-        fi
-    done
-    
-    if [ -z "$(grep 'queue_type' ${PBS_SERVER_HOME}/server_priv/queues/*)" ]; then
-        eerror "No queues have been defined yet."
-        return 1
-    fi
-}
-
-start() {
-    checkconfig || return 1
-
-    ebegin "Starting Torque pbs_server"
-    local extra_args=""
-    if [ -n "${PBS_SERVER_LOG}" ]; then
-        extra_args="-- -L ${PBS_SERVER_LOG}"
-    fi
-
-    start-stop-daemon  --start -p ${PBS_SERVER_HOME}/server_priv/server.lock \
-        --exec /usr/sbin/pbs_server ${extra_args}
-    eend ${?}		
-}
-
-stop() {
-    ebegin "Stopping Torque pbs_server"
-    stop_type="${PBS_SERVER_STOP}"
-    if [ -z "${stop_type}" ]; then
-        ewarn "PBS_SERVER_STOP is not defined, defaulting to quick"
-        stop_type=quick
-    fi
-
-    /usr/bin/qterm -t ${stop_type} || start-stop-daemon --stop -p ${PBS_SERVER_HOME}/server_priv/server.lock
-    eend ${?}
-}
-# vim:ts=4
diff --git a/sys-cluster/torque/files/torque-2.3-fixes-r2221-2227.patch b/sys-cluster/torque/files/torque-2.3-fixes-r2221-2227.patch
deleted file mode 100644
index 81af4a5e790c..000000000000
--- a/sys-cluster/torque/files/torque-2.3-fixes-r2221-2227.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-Index: src/include/qmgr.h
-===================================================================
---- src/include/qmgr.h	(revision 2221)
-+++ src/include/qmgr.h	(revision 2227)
-@@ -166,30 +166,30 @@
- 
- 
- /* prototypes */
--struct objname *commalist2objname();
--struct server *find_server();
-+struct objname *commalist2objname(char *, int);
-+struct server *find_server(char *);
- struct server *make_connection();
- struct server *new_server();
- struct objname *new_objname();
--struct objname *strings2objname( );
-+struct objname *strings2objname(char **, int, int);
- struct objname *default_server_name();
--struct objname *temp_objname();
--int parse_request( );
--void clean_up_and_exit();
--void freeattrl();
--void freeattropl();
--void pstderr_big();
--void free_objname_list();
--void free_server();
--void free_objname();
-+struct objname *temp_objname(char *, char *, struct server *);
-+int parse_request(char *, char [][MAX_REQ_WORD_LEN]);
-+void clean_up_and_exit(int);
-+void freeattrl(struct attrl *);
-+void freeattropl(struct attropl *);
-+void pstderr_big(char *, char*, char *);
-+void free_objname_list(struct objname *);
-+void free_server(struct server *);
-+void free_objname(struct objname *);
- void close_non_ref_servers();
--int connect_servers();
--int set_active();
--int get_request();
--int parse();
--int execute();
--int is_attr();
--int is_valid_object();
-+int connect_servers(struct objname *, int);
-+int set_active(int, struct objname *);
-+int get_request(char *);
-+int parse(char *, int *, int *, char **, struct attropl **);
-+int execute(int, int, int, char *, struct attropl *);
-+int is_attr(int, char *, int);
-+int is_valid_object(struct objname *, int);
- void disconnect_from_server();
- 
- 
-Index: src/include/md5.h
-===================================================================
---- src/include/md5.h	(revision 2221)
-+++ src/include/md5.h	(revision 2227)
-@@ -55,9 +55,9 @@
-   unsigned char digest[16];     /* actual digest after MD5Final call */
- } MD5_CTX;
- 
--void MD5Init ();
--void MD5Update ();
--void MD5Final ();
-+void MD5Init (MD5_CTX *);
-+void MD5Update (MD5_CTX *, unsigned char *, unsigned int);
-+void MD5Final (MD5_CTX *);
- 
- #define __MD5_INCLUDE__
- #endif /* __MD5_INCLUDE__ */
-Index: src/include/mom_func.h
-===================================================================
---- src/include/mom_func.h	(revision 2221)
-+++ src/include/mom_func.h	(revision 2227)
-@@ -149,7 +149,7 @@
- extern int   set_mach_vars A_((job *, struct var_table *));
- extern char *set_shell A_((job *, struct passwd *));
- extern void  start_exec A_((job *));
--extern int   open_master();
-+extern int   open_master(char **);
- extern int   open_slave();
- extern char *rcvttype A_((int));
- extern int   rcvwinsize A_((int));
-Index: src/include/pbs_config.h.in
-===================================================================
---- src/include/pbs_config.h.in	(revision 2221)
-+++ src/include/pbs_config.h.in	(revision 2227)
-@@ -316,6 +316,9 @@
- /* use nodemask-based scheduling on O2k */
- #undef NODEMASK
- 
-+/* Define to disable posix memlock */
-+#undef NOPOSIXMEMLOCK
-+
- /* Define to disable privileged ports */
- #undef NOPRIVPORTS
- 
-Index: src/cmds/qstop.c
-===================================================================
---- src/cmds/qstop.c	(revision 2221)
-+++ src/cmds/qstop.c	(revision 2227)
-@@ -108,7 +108,7 @@
- 
- 
- int exitstatus = 0; /* Exit Status */
--static void execute ();
-+static void execute (char *, char *);
- 
- 
- int main ( argc, argv )
-Index: src/cmds/qenable.c
-===================================================================
---- src/cmds/qenable.c	(revision 2221)
-+++ src/cmds/qenable.c	(revision 2227)
-@@ -109,7 +109,7 @@
- 
- 
- int exitstatus = 0; /* Exit Status */
--static void execute ();
-+static void execute (char *, char *);
- 
- 
- int main(
-Index: src/cmds/qsub.c
-===================================================================
---- src/cmds/qsub.c	(revision 2221)
-+++ src/cmds/qsub.c	(revision 2227)
-@@ -3823,7 +3823,7 @@
-       {
-       strcat(submit_args_str,argv[argi]);
- 
--      if (argi != optind - 1)
-+      if (argi != argc - 1)
-         {
-         strcat(submit_args_str," ");
-         }
-Index: src/cmds/qstart.c
-===================================================================
---- src/cmds/qstart.c	(revision 2221)
-+++ src/cmds/qstart.c	(revision 2227)
-@@ -108,7 +108,7 @@
- 
- 
- int exitstatus = 0; /* Exit Status */
--static void execute ();
-+static void execute (char *, char *);
- 
- 
- int main ( 
-Index: src/cmds/qdisable.c
-===================================================================
---- src/cmds/qdisable.c	(revision 2221)
-+++ src/cmds/qdisable.c	(revision 2227)
-@@ -110,7 +110,7 @@
- 
- int exitstatus = 0; /* Exit Status */
- 
--static void execute ();
-+static void execute (char *, char *);
- 
- int main ( argc, argv )
- int argc;
-Index: src/cmds/qrun.c
-===================================================================
---- src/cmds/qrun.c	(revision 2221)
-+++ src/cmds/qrun.c	(revision 2227)
-@@ -101,7 +101,7 @@
- #include <pbs_config.h>   /* the master config generated by configure */
- 
- int exitstatus = 0; /* Exit Status */
--static void execute();
-+static void execute(char *, char *, char *, int);
- 
- 
- 
-Index: src/cmds/qterm.c
-===================================================================
---- src/cmds/qterm.c	(revision 2221)
-+++ src/cmds/qterm.c	(revision 2227)
-@@ -113,7 +113,7 @@
- 
- int exitstatus = 0; /* Exit Status */
- 
--static void execute();
-+static void execute(int, char *);
- 
- int main(
- 
-Index: src/resmom/start_exec.c
-===================================================================
---- src/resmom/start_exec.c	(revision 2221)
-+++ src/resmom/start_exec.c	(revision 2227)
-@@ -133,6 +133,10 @@
- #include "pbs_cpuset.h"
- #endif
- 
-+#ifdef NOPOSIXMEMLOCK
-+#undef _POSIX_MEMLOCK 
-+#endif /* NOPOSIXMEMLOCK */
-+
- #define EXTRA_VARIABLE_SPACE 2000
- #define EXTRA_ENV_PTRS	       32
- 
-@@ -4678,9 +4682,9 @@
- 
-     MD5Init(&c);
- 
--    MD5Update(&c,(caddr_t)&loopcnt,sizeof(loopcnt));
-+    MD5Update(&c,(unsigned char *)&loopcnt,sizeof(loopcnt));
- 
--    MD5Update(&c,(caddr_t)pjob,sizeof(job));
-+    MD5Update(&c,(unsigned char *)pjob,sizeof(job));
- 
-     MD5Final(&c);
- 
-@@ -5286,7 +5290,7 @@
- 
-     /* don't do for checkpoint file names, only StdErr and StdOut */
-     
--    if (suffix != JOB_CKPT_SUFFIX)
-+    if (strcmp(suffix, JOB_CKPT_SUFFIX) != 0)
-       {  
-       pt = strstr(jobpath,"$HOME");
- 
-Index: src/resmom/mom_server.c
-===================================================================
---- src/resmom/mom_server.c	(revision 2221)
-+++ src/resmom/mom_server.c	(revision 2227)
-@@ -2533,7 +2533,7 @@
-   {
-   int sindex;
- 
--  for (sindex = 0; sindex < PBS_MAXSERVER || down_svraddrs[sindex] == 0; sindex++)
-+  for (sindex = 0; sindex < PBS_MAXSERVER && down_svraddrs[sindex] != 0; sindex++)
-     {
-     if (down_svraddrs[sindex] == server_address)
-       {
-Index: src/resmom/mom_main.c
-===================================================================
---- src/resmom/mom_main.c	(revision 2221)
-+++ src/resmom/mom_main.c	(revision 2227)
-@@ -146,6 +146,9 @@
- 
- #include        "mcom.h"
- 
-+#ifdef NOPOSIXMEMLOCK
-+#undef _POSIX_MEMLOCK 
-+#endif /* NOPOSIXMEMLOCK */
- 
- #ifdef _POSIX_MEMLOCK 
- #include <sys/mman.h>
-Index: src/server/req_stat.c
-===================================================================
---- src/server/req_stat.c	(revision 2221)
-+++ src/server/req_stat.c	(revision 2227)
-@@ -119,7 +119,7 @@
- extern int	       pbs_mom_port;
- extern time_t	       time_now;
- extern char	      *msg_init_norerun;
--extern struct pbsnode *tfind_addr();
-+extern struct pbsnode *tfind_addr(const u_long);
- extern int             LOGLEVEL;
- 
- /* Extern Functions */
-Index: src/lib/Libnet/md5.c
-===================================================================
---- src/lib/Libnet/md5.c	(revision 2221)
-+++ src/lib/Libnet/md5.c	(revision 2227)
-@@ -49,7 +49,7 @@
-  */
- 
- /* forward declaration */
--static void Transform ();
-+static void Transform (UINT4 *, UINT4 *);
- 
- static unsigned char PADDING[64] = {
-   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-Index: src/lib/Libnet/net_server.c
-===================================================================
---- src/lib/Libnet/net_server.c	(revision 2221)
-+++ src/lib/Libnet/net_server.c	(revision 2227)
-@@ -115,7 +115,7 @@
- 
- extern void process_request A_((int));
- 
--extern time_t time();
-+extern time_t time(time_t *);
- 
- /* Global Data (I wish I could make it private to the library, sigh, but
-  * C don't support that scope of control.)
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 2221)
-+++ configure.ac	(revision 2227)
-@@ -79,7 +79,7 @@
- dnl
- AC_MSG_CHECKING([whether to turn on the AUTORUN_JOBS flag])
- AC_ARG_ENABLE(autorun,
--    [  --enable-autorun          turn on the AUTORUN_JOBS flag],
-+    [  --enable-autorun        turn on the AUTORUN_JOBS flag],
-     enable_autorun=$enableval, enable_autorun=no)
- AC_MSG_RESULT($enable_autorun)
- if test "x$enable_autorun" = "xyes" ; then
-@@ -94,7 +94,7 @@
- dnl
- AC_MSG_CHECKING([whether to turn on the RESOURCEMAXNOTDEFAULT flag])
- AC_ARG_ENABLE(maxnotdefault,
--    [  --enable-maxnotdefault          turn on the RESOURCEMAXNOTDEFAULT flag],
-+    [  --enable-maxnotdefault  turn on the RESOURCEMAXNOTDEFAULT flag],
-     enable_maxnotdefault=$enableval, enable_maxnotdefault=no)
- AC_MSG_RESULT($enable_maxnotdefault)
- if test "x$enable_maxnotdefault" = "xyes" ; then
-@@ -108,7 +108,7 @@
- dnl
- AC_MSG_CHECKING([whether to turn on the QUICKCOMMIT flag])
- AC_ARG_ENABLE(quickcommit,
--    [  --enable-quickcommit          turn on the QUICKCOMMIT flag],
-+    [  --enable-quickcommit    turn on the QUICKCOMMIT flag],
-     enable_quickcommit=$enableval, enable_quickcommit=no)
- AC_MSG_RESULT($enable_quickcommit)
- if test "x$enable_quickcommit" = "xyes" ; then
-@@ -122,7 +122,7 @@
- dnl
- AC_MSG_CHECKING([whether to turn on the NO_SIGCHLD flag])
- AC_ARG_ENABLE(nochildsignal,
--    [  --enable-nochildsignal          turn on the NO_SIGCHLD flag],
-+    [  --enable-nochildsignal  turn on the NO_SIGCHLD flag],
-     enable_nochildsignal=$enableval, enable_nochildsignal=no)
- AC_MSG_RESULT($enable_nochildsignal)
- if test "x$enable_nochildsignal" = "xyes" ; then
-@@ -709,6 +709,18 @@
- AC_DEFINE_UNQUOTED(SHELL_USE_ARGV, ${SHELL_USE_ARGV}, [job script name passed as the shell's arg])
- 
- 
-+
-+AC_ARG_ENABLE(posixmemlock, [
-+  --disable-posixmemlock  disable the moms use of mlockall.  
-+                          Some versions of OSs seem to have buggy POSIX MEMLOCK.],
-+[case "${enableval}" in
-+  yes)  ;;
-+  no)  NOPOSIXMEMLOCK=1; AC_DEFINE(NOPOSIXMEMLOCK, 1, [Define to disable mlockall]) ;;
-+  *)   AC_MSG_ERROR(--enable-posixmemlock cannot take a value) ;;
-+esac])dnl
-+
-+
-+
- AC_ARG_ENABLE(privports, [
-   --disable-privports     disable the use of privileged ports for authentication.  
-                           Some versions of OSX have a buggy bind() and cannot
-@@ -726,7 +738,7 @@
- [case "${enableval}" in
-   yes) MOMCHECKLOCALSPOOL=1 ;;
-   no)  MOMCHECKLOCALSPOOL=0;;
--  *)   AC_MSG_ERROR(--enable-privports cannot take a value) ;;
-+  *)   AC_MSG_ERROR(--enable-mom-checkspool cannot take a value) ;;
- esac],[MOMCHECKLOCALSPOOL=1])dnl
- AC_DEFINE_UNQUOTED(MOMCHECKLOCALSPOOL, ${MOMCHECKLOCALSPOOL}, [Define to error if spool is full on MOM])
- 
-Index: doc/soelim.c
-===================================================================
---- doc/soelim.c	(revision 2221)
-+++ doc/soelim.c	(revision 2227)
-@@ -102,7 +102,7 @@
- 	int argc;
- 	char *argv[];
- {
--	int   dofile();
-+	int   dofile(FILE *);
- 	int   dirct = 0;
- 	FILE *filein;
- 	int   i;
diff --git a/sys-cluster/torque/files/torque-conf.d-2.2.1 b/sys-cluster/torque/files/torque-conf.d-2.2.1
deleted file mode 100644
index 66da9ee8edcd..000000000000
--- a/sys-cluster/torque/files/torque-conf.d-2.2.1
+++ /dev/null
@@ -1,19 +0,0 @@
-# This is the default server-home set by the ebuild and upstream
-# If you change this, be sure to fix /etc/env.d/25torque as well.
-PBS_SERVER_HOME=/var/spool/torque
-
-
-# The default logging takes place in $PBS_SERVER_HOME/<mom/server/sched>_priv.
-# If you'd like to change that, use the following per service.
-PBS_SERVER_LOG=/var/log/pbs_server.log
-PBS_MOM_LOG=/var/log/pbs_mom.log
-PBS_SCHED_LOG=/var/log/pbs_sched.log
-
-
-# There are a number of ways to stop the pbs server.  For more details, man qterm
-# At the time of writing, checkpoint is probably not working.
-# immediate:  All jobs are killed.
-# delay:  Checkpoint, rerun or wait for jobs to finish before stopping
-# quick:  Remember running jobs, and let them run without interaction with pbs_server.
-#         This is the default action
-PBS_SERVER_STOP=quick
diff --git a/sys-cluster/torque/files/torque-env.d-2.2.1 b/sys-cluster/torque/files/torque-env.d-2.2.1
deleted file mode 100644
index fa68e7b7965c..000000000000
--- a/sys-cluster/torque/files/torque-env.d-2.2.1
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-# Configuration files that are included in the initial Torque install
-CONFIG_PROTECT="/var/spool/torque/sched_priv/{holidays,resource_group,dedicated_time,sched_config} /var/spool/torque/{server_name,pbs_environment}"
-
diff --git a/sys-cluster/torque/files/torque-setuid-safety-am.patch b/sys-cluster/torque/files/torque-setuid-safety-am.patch
deleted file mode 100644
index 737e82a815d7..000000000000
--- a/sys-cluster/torque/files/torque-setuid-safety-am.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/iff/Makefile.am.orig	2007-03-02 22:15:56.000000000 -0700
-+++ src/iff/Makefile.am	2007-03-02 22:16:37.000000000 -0700
-@@ -6,6 +6,8 @@
- 
- pbs_iff_LDADD = $(PBS_LIBS)
- 
-+pbs_iff_LDFLAGS = -Wl,-z,now
-+
- pbs_iff_SOURCES = iff2.c
- 
- install-exec-hook:
---- src/mom_rcp/Makefile.am.orig	2007-03-02 22:17:03.000000000 -0700
-+++ src/mom_rcp/Makefile.am	2007-03-02 22:17:47.000000000 -0700
-@@ -4,6 +4,8 @@
- 
- pbs_rcp_SOURCES = rcp.c replace.c util.c extern.h  pathnames.h
- 
-+pbs_rcp_LDFLAGS = -Wl,-z,now
-+
- EXTRA_DIST = ReadMe
- 
- install-exec-hook:
diff --git a/sys-cluster/torque/files/torque-setuid-safety.patch b/sys-cluster/torque/files/torque-setuid-safety.patch
deleted file mode 100644
index 81dba4b143fc..000000000000
--- a/sys-cluster/torque/files/torque-setuid-safety.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur torque-2.1.0p0/src/iff/Makefile.in torque-2.1.0p0.new/src/iff/Makefile.in
---- torque-2.1.0p0/src/iff/Makefile.in	2006-04-06 22:56:32.000000000 +0100
-+++ torque-2.1.0p0.new/src/iff/Makefile.in	2006-05-19 23:51:52.000000000 +0100
-@@ -146,7 +146,7 @@
- am_pbs_iff_OBJECTS = iff2.$(OBJEXT)
- pbs_iff_OBJECTS = $(am_pbs_iff_OBJECTS)
- pbs_iff_DEPENDENCIES = ../lib/Libpbs/libtorque.la
--pbs_iff_LDFLAGS =
-+pbs_iff_LDFLAGS = -Wl,-z,now
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/src/include
-diff -Naur torque-2.1.0p0/src/mom_rcp/Makefile.in torque-2.1.0p0.new/src/mom_rcp/Makefile.in
---- torque-2.1.0p0/src/mom_rcp/Makefile.in	2006-04-06 22:56:34.000000000 +0100
-+++ torque-2.1.0p0.new/src/mom_rcp/Makefile.in	2006-05-19 23:52:42.000000000 +0100
-@@ -145,7 +145,7 @@
- pbs_rcp_OBJECTS = $(am_pbs_rcp_OBJECTS)
- pbs_rcp_LDADD = $(LDADD)
- pbs_rcp_DEPENDENCIES =
--pbs_rcp_LDFLAGS =
-+pbs_rcp_LDFLAGS = -Wl,-z,now
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/src/include
diff --git a/sys-cluster/torque/torque-2.2.1-r2.ebuild b/sys-cluster/torque/torque-2.2.1-r2.ebuild
deleted file mode 100644
index cc4c12607f10..000000000000
--- a/sys-cluster/torque/torque-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r2.ebuild,v 1.9 2008/04/12 18:56:06 dertobi123 Exp $
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.clusterresources.com/products/torque/"
-SRC_URI="http://www.clusterresources.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="openpbs"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="tk crypt server syslog doc"
-PROVIDE="virtual/pbs"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="virtual/libc
-	sys-libs/ncurses
-	sys-libs/readline
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!virtual/pbs
-	!sys-cluster/openpbs-common
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	sys-apps/ed"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-[ -n "${PBS_SERVER_HOME}" ] || PBS_SERVER_HOME="/var/spool/torque"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-setuid-safety-am.patch
-	# Otherwise we'll fail due to strings over ISO C89 defined length 509
-	sed -i 's:gcc_warning_flags="\(.*\)-Werror":gcc_warning_flags="\1":' configure.ac
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	local myconf
-
-	if use crypt; then
-		myconf="--with-rcp=scp"
-	else
-		myconf="--with-rcp=mom_rcp"
-	fi
-
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-
-	# TODO:  Allow cpusets
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-# 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}"
-		else
-			chmod ${m} "${root}${d}"
-		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}"
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-	fi
-
-	# this file MUST exist for PBS/Torque to work
-	# but try to preserve any customatizations that the user has made
-	dodir /etc
-	mv "${D}"${PBS_SERVER_HOME}/pbs_environment "${D}"/etc/
-
-	# 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}"
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-2.2.1-r1 pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d-2.2.1-r1 pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-2.2.1-r1 pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d-2.2.1-r1 torque
-	newenvd "${FILESDIR}"/torque-env.d-2.2.1-r1 25torque
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
-	fi
-
-	if [ -n "${PBS_SERVER_NAME}" ]; then
-		echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
-	elif [[ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]]; then
-		cp "${ROOT}${PBS_SERVER_HOME}/server_name" "${D}${PBS_SERVER_HOME}/server_name"
-	fi
-
-	# 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
-}
-
-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"
-
-	elog "For a basic setup, you may use emerge --config ${PN}"
-
-	elog "There are a couple of changes in this ebuild."
-	elog "1.) The pbs-server-home has been moved from /var/spool/PBS to /var/spool/torque."
-	elog "2.) pbs_server, pbs_mom and pbs_sched now have separate init scripts"
-
-	elog "Be sure to run env-update if this is your first install or you"
-	elog "changed PBS_SERVER_HOME!"
-}
-
-# Either the correct PBS_SERVER_HOME and PBS_SERVER_NAME are set
-# or we use the default HOME and the localhost as the server.
-# 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="${ROOT}/${PBS_SERVER_HOME}"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-	einfo "Using ${PBS_SERVER_HOME} 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 any key to"
-		ewarn "continue or press Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
-	echo "\$logevent 255" >> "${h}/mom_priv/config"
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server \
-			-d "${ROOT}${PBS_SERVER_HOME}" -t create &>/dev/null; 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}
-
-			"${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"
-		fi
-	fi
-	eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-2.3.0-r1.ebuild b/sys-cluster/torque/torque-2.3.0-r1.ebuild
deleted file mode 100644
index b2a2d7db1cd6..000000000000
--- a/sys-cluster/torque/torque-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.0-r1.ebuild,v 1.6 2009/01/08 23:21:21 jsbronder Exp $
-
-inherit flag-o-matic eutils linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.clusterresources.com/products/torque/"
-SRC_URI="http://www.clusterresources.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="openpbs"
-
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
-IUSE="tk crypt server syslog doc cpusets kernel_linux"
-PROVIDE="virtual/pbs"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="virtual/libc
-	sys-libs/ncurses
-	sys-libs/readline
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!virtual/pbs
-	!sys-cluster/openpbs-common
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	sys-apps/ed"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-[ -n "${PBS_SERVER_HOME}" ] || PBS_SERVER_HOME="/var/spool/torque"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	USE_CPUSETS="--disable-cpusets"
-	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
-			einfo
-			elog "    Torque support for cpusets is still in development, you may"
-			elog "wish to disable it for production use."
-			einfo
-			if ! 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-cpusets"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Pulled from the torque-2.3.0-fixes branch.  Takes care of bug 213279.
-	# Will not be required next version.
-	epatch "${FILESDIR}"/${PV}-fixes_r2031.patch
-}
-
-src_compile() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		${USE_CPUSETS} \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-# 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}"
-		else
-			chmod ${m} "${root}${d}"
-		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}"
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-	fi
-
-	# 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}"
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-2.2.1-r1 pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d-2.2.1-r1 pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-2.2.1-r1 pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d-2.2.1-r1 torque
-	newenvd "${FILESDIR}"/torque-env.d-2.2.1-r1 25torque
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
-	fi
-
-	if [ -n "${PBS_SERVER_NAME}" ]; then
-		echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
-	elif [[ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]]; then
-		cp "${ROOT}${PBS_SERVER_HOME}/server_name" "${D}${PBS_SERVER_HOME}/server_name"
-	fi
-
-	# 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
-}
-
-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"
-
-	elog "    For a basic setup, you may use emerge --config ${PN}"
-}
-
-# Either the correct PBS_SERVER_HOME and PBS_SERVER_NAME are set
-# or we use the default HOME and the localhost as the server.
-# 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="${ROOT}/${PBS_SERVER_HOME}"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-	einfo "Using ${PBS_SERVER_HOME} 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 any key to"
-		ewarn "continue or press Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
-	echo "\$logevent 255" >> "${h}/mom_priv/config"
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server \
-			-d "${ROOT}${PBS_SERVER_HOME}" -t create &>/dev/null; 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}
-
-			"${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"
-		fi
-	fi
-	eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-2.3.1.ebuild b/sys-cluster/torque/torque-2.3.1.ebuild
deleted file mode 100644
index 5dc0f721ab67..000000000000
--- a/sys-cluster/torque/torque-2.3.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.1.ebuild,v 1.3 2009/01/08 23:21:21 jsbronder Exp $
-
-inherit flag-o-matic eutils linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.clusterresources.com/products/torque/"
-SRC_URI="http://www.clusterresources.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="openpbs"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="tk crypt server syslog doc cpusets kernel_linux"
-PROVIDE="virtual/pbs"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="virtual/libc
-	sys-libs/ncurses
-	sys-libs/readline
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!virtual/pbs
-	!sys-cluster/openpbs-common
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	sys-apps/ed"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-[ -n "${PBS_SERVER_HOME}" ] || PBS_SERVER_HOME="/var/spool/torque"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	USE_CPUSETS="--disable-cpusets"
-	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
-			einfo
-			elog "    Torque support for cpusets is still in development, you may"
-			elog "wish to disable it for production use."
-			einfo
-			if ! 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-cpusets"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fixes gcc-4.2 compile errors.  Changes to configure and CHANGELOG had to
-	# be removed to get the patch to apply cleanly.
-	# TODO:  Will not be required in 2.3.2
-	epatch "${FILESDIR}"/torque-2.3-fixes-r2221-2227.patch
-}
-
-src_compile() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		${USE_CPUSETS} \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-# 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}"
-		else
-			chmod ${m} "${root}${d}"
-		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}"
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-	fi
-
-	# 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}"
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-2.2.1-r1 pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d-2.2.1-r1 pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-2.2.1-r1 pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d-2.2.1-r1 torque
-	newenvd "${FILESDIR}"/torque-env.d-2.2.1-r1 25torque
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
-	fi
-
-	if [ -n "${PBS_SERVER_NAME}" ]; then
-		echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
-	elif [[ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]]; then
-		cp "${ROOT}${PBS_SERVER_HOME}/server_name" "${D}${PBS_SERVER_HOME}/server_name"
-	fi
-
-	# 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
-}
-
-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"
-
-	elog "    For a basic setup, you may use emerge --config ${PN}"
-}
-
-# Either the correct PBS_SERVER_HOME and PBS_SERVER_NAME are set
-# or we use the default HOME and the localhost as the server.
-# 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="${ROOT}/${PBS_SERVER_HOME}"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-	einfo "Using ${PBS_SERVER_HOME} 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 any key to"
-		ewarn "continue or press Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
-	echo "\$logevent 255" >> "${h}/mom_priv/config"
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server \
-			-d "${ROOT}${PBS_SERVER_HOME}" -t create &>/dev/null; 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}
-
-			"${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"
-		fi
-	fi
-	eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-2.3.2.ebuild b/sys-cluster/torque/torque-2.3.2.ebuild
deleted file mode 100644
index 9998f739b3fb..000000000000
--- a/sys-cluster/torque/torque-2.3.2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.2.ebuild,v 1.2 2009/01/08 23:21:21 jsbronder Exp $
-
-inherit flag-o-matic eutils linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.clusterresources.com/products/torque/"
-SRC_URI="http://www.clusterresources.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="openpbs"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="tk crypt server syslog doc cpusets kernel_linux"
-PROVIDE="virtual/pbs"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="virtual/libc
-	sys-libs/ncurses
-	sys-libs/readline
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!virtual/pbs
-	!sys-cluster/openpbs-common
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	sys-apps/ed"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-pkg_setup() {
-	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
-
-	USE_CPUSETS="--disable-cpusets"
-	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_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-cpusets"
-		fi
-	fi
-}
-
-src_compile() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		${USE_CPUSETS} \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-# 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}"
-		else
-			chmod ${m} "${root}${d}"
-		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}"
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-	fi
-
-	# 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}"
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-2.2.1-r1 pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d-2.2.1-r1 pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-2.2.1-r1 pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d-2.2.1-r1 torque
-	newenvd "${FILESDIR}"/torque-env.d-2.2.1-r1 25torque
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
-	fi
-
-	if [ -n "${PBS_SERVER_NAME}" ]; then
-		echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
-	elif [[ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]]; then
-		cp "${ROOT}${PBS_SERVER_HOME}/server_name" "${D}${PBS_SERVER_HOME}/server_name"
-	fi
-
-	# 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
-}
-
-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"
-
-	elog "    For a basic setup, you may use emerge --config ${PN}"
-}
-
-# Either the correct PBS_SERVER_HOME and PBS_SERVER_NAME are set
-# or we use the default HOME and the localhost as the server.
-# 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="${ROOT}/${PBS_SERVER_HOME}"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-	einfo "Using ${PBS_SERVER_HOME} 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 any key to"
-		ewarn "continue or press Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
-	echo "\$logevent 255" >> "${h}/mom_priv/config"
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server \
-			-d "${ROOT}${PBS_SERVER_HOME}" -t create &>/dev/null; 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}
-
-			"${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"
-		fi
-	fi
-	eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-2.3.3.ebuild b/sys-cluster/torque/torque-2.3.3.ebuild
deleted file mode 100644
index 6a8e8da250b1..000000000000
--- a/sys-cluster/torque/torque-2.3.3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.3.ebuild,v 1.2 2009/01/08 23:21:21 jsbronder Exp $
-
-inherit flag-o-matic eutils linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.clusterresources.com/products/torque/"
-SRC_URI="http://www.clusterresources.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="openpbs"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="tk crypt server syslog doc cpusets kernel_linux"
-PROVIDE="virtual/pbs"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="virtual/libc
-	sys-libs/ncurses
-	sys-libs/readline
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!virtual/pbs
-	!sys-cluster/openpbs-common
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	sys-apps/ed"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-pkg_setup() {
-	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
-
-	USE_CPUSETS="--disable-cpusets"
-	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_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-cpusets"
-		fi
-	fi
-}
-
-src_compile() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		${USE_CPUSETS} \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-# 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}"
-		else
-			chmod ${m} "${root}${d}"
-		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}"
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes || die "dodoc failed"
-	if use doc; then
-		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
-	fi
-
-	# 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}"
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-2.2.1-r1 pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d-2.2.1-r1 pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-2.2.1-r1 pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d-2.2.1-r1 torque
-	newenvd "${FILESDIR}"/torque-env.d-2.2.1-r1 25torque
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
-	fi
-
-	if [ -n "${PBS_SERVER_NAME}" ]; then
-		echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
-	elif [[ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]]; then
-		cp "${ROOT}${PBS_SERVER_HOME}/server_name" "${D}${PBS_SERVER_HOME}/server_name"
-	fi
-
-	# 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
-}
-
-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"
-
-	elog "    For a basic setup, you may use emerge --config ${PN}"
-}
-
-# Either the correct PBS_SERVER_HOME and PBS_SERVER_NAME are set
-# or we use the default HOME and the localhost as the server.
-# 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"
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-	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 any key to"
-		ewarn "continue or press Control-C to abort now"
-		read
-	fi
-
-	# pbs_mom configuration.
-	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
-	echo "\$logevent 255" >> "${h}/mom_priv/config"
-
-	if use server; then
-		local qmgr="${ROOT}/usr/bin/qmgr -c"
-		# pbs_server bails on repeated backslashes.
-		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server -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}
-
-			"${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"
-		fi
-	fi
-	eend ${rc}
-}