Set library directory to /usr/libdir/pbs/lib rather than /usr/libdir/pbs for compatibility with other programs.

Package-Manager: portage-2.1.2_pre1-r3

5 files changed, 177 insertions, 13 deletions

diff --git a/sys-cluster/pvm/Manifest b/sys-cluster/pvm/Manifest
index 36d151eabd0a..f6526182144e 100644
--- a/sys-cluster/pvm/Manifest
+++ b/sys-cluster/pvm/Manifest
@@ -10,6 +10,10 @@ AUX pvm-3.4.4-x86_64-segfault.patch 2478 RMD160 312ffa58795b1a4fe1589070972131cd
 MD5 1f52ad91cea65624c2bed0e33db5f7b4 files/pvm-3.4.4-x86_64-segfault.patch 2478
 RMD160 312ffa58795b1a4fe1589070972131cd2e40b5f2 files/pvm-3.4.4-x86_64-segfault.patch 2478
 SHA256 5b9bf5f697959ce861075ae8ae689cc7c291e350921df744bd6b4f8fa85fafd7 files/pvm-3.4.4-x86_64-segfault.patch 2478
+AUX pvm-3.4.5-bug_147337.patch 361 RMD160 a9348f940c9b2c603ea7f063e58a7796a0220c00 SHA1 dba583651f12488a6778ef09ae59b2f6885cda62 SHA256 aed7c9e088a2e52a83a2b5434c5e58b3fcd06bf94128f7547274fd67d4fb1ccf
+MD5 d502abaaf2d967b6c37e6068273651df files/pvm-3.4.5-bug_147337.patch 361
+RMD160 a9348f940c9b2c603ea7f063e58a7796a0220c00 files/pvm-3.4.5-bug_147337.patch 361
+SHA256 aed7c9e088a2e52a83a2b5434c5e58b3fcd06bf94128f7547274fd67d4fb1ccf files/pvm-3.4.5-bug_147337.patch 361
 AUX pvm-3.4.5-envvars.patch 732 RMD160 57c0e8b37c4255dea33ae940fd287e0adaa406ae SHA1 151d2957d7b62a4c87a45490f36e6db0de639219 SHA256 bce6c0261dbaa0f78bfec1fae5b0ee88aac15ef4d3cd6bf9162d836d95d2a647
 MD5 52c60bea6e97bcc060451d7bf2c60bdd files/pvm-3.4.5-envvars.patch 732
 RMD160 57c0e8b37c4255dea33ae940fd287e0adaa406ae files/pvm-3.4.5-envvars.patch 732
@@ -48,14 +52,14 @@ EBUILD pvm-3.4.4-r3.ebuild 1977 RMD160 f29f51036bbb3935b2e49199517f5f97c288bcb9
 MD5 6d0e73270cf22c002d2706f4abb59fe0 pvm-3.4.4-r3.ebuild 1977
 RMD160 f29f51036bbb3935b2e49199517f5f97c288bcb9 pvm-3.4.4-r3.ebuild 1977
 SHA256 37840ab2d980a50ed277865209c6d641c56621f1e906b52f0a479d344b1e5a8a pvm-3.4.4-r3.ebuild 1977
-EBUILD pvm-3.4.5-r2.ebuild 2540 RMD160 3766b867973dbbf5715523415636fda682baebcf SHA1 3f239ec3b57601d298ddd7abb782f51c699f4f2a SHA256 00626a34da90e6b4363a731609b9aff78f1400ff1ae76cfaee57dcffa7e59276
-MD5 8b6af96318ff116c8e08a3f2c14c3225 pvm-3.4.5-r2.ebuild 2540
-RMD160 3766b867973dbbf5715523415636fda682baebcf pvm-3.4.5-r2.ebuild 2540
-SHA256 00626a34da90e6b4363a731609b9aff78f1400ff1ae76cfaee57dcffa7e59276 pvm-3.4.5-r2.ebuild 2540
-MISC ChangeLog 4560 RMD160 169e924b17138a5114190fcf5645586068037d4b SHA1 990cfbd142c497d19f801cbfd470e249d0e87a90 SHA256 3afaba567f02c3b78e42d8ee92796fa55b22412a35d7fb4b0f3956c152d3c8ad
-MD5 dd7da5c425f8973107d5044fd81f0b2e ChangeLog 4560
-RMD160 169e924b17138a5114190fcf5645586068037d4b ChangeLog 4560
-SHA256 3afaba567f02c3b78e42d8ee92796fa55b22412a35d7fb4b0f3956c152d3c8ad ChangeLog 4560
+EBUILD pvm-3.4.5-r2.ebuild 2589 RMD160 692f0d5a0d08793c5001f6b651d106fcfc0cc6bd SHA1 9d4b176b50523f11516cbbe4c6d6f9c15d51d372 SHA256 62eb0a50236544fe9386eb7fba73fae78d4899fa8e800c8df09ca27480bfaaaf
+MD5 4ef78c49b6946bb3d43cebabddaecb66 pvm-3.4.5-r2.ebuild 2589
+RMD160 692f0d5a0d08793c5001f6b651d106fcfc0cc6bd pvm-3.4.5-r2.ebuild 2589
+SHA256 62eb0a50236544fe9386eb7fba73fae78d4899fa8e800c8df09ca27480bfaaaf pvm-3.4.5-r2.ebuild 2589
+MISC ChangeLog 4718 RMD160 698df58eee162d7f68b840235032113afefd7c44 SHA1 8cbc1ff994e12ec083c7c28fb443d87fdb7f7379 SHA256 008cf8bc681d9cfef02954f62b77b1e7985aabaad661ade97e56dd93e572c174
+MD5 e6fe37c62b76679a6739f3cb4abfc314 ChangeLog 4718
+RMD160 698df58eee162d7f68b840235032113afefd7c44 ChangeLog 4718
+SHA256 008cf8bc681d9cfef02954f62b77b1e7985aabaad661ade97e56dd93e572c174 ChangeLog 4718
 MISC metadata.xml 312 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e SHA1 d9e2361eabc2098c0fa0b2fe45ba7cf317ad00a2 SHA256 7cd6722fa6245eccb8afde378bb57d0ac955b778512b3bef8789f2c463884e52
 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
 RMD160 6cfe7222819f902eed7dfdb6fa48a19b7c37172e metadata.xml 312
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 0b00073bbd46..77c50f844972 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.30 2006/09/25 21:22:16 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.31 2006/09/26 05:10:51 dberkholz Exp $
+
+*torque-2.1.2-r1 (26 Sep 2006)
+
+  26 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +torque-2.1.2-r1.ebuild:
+  Set library directory to /usr/libdir/pbs/lib rather than /usr/libdir/pbs for
+  compatibility with other programs.
 
   25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; torque-2.1.2.ebuild:
   (#115189) Change tclx dep to tk, tclx isn't actually required (Ian
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 453f52b89eed..c0f94e50c404 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -28,14 +28,18 @@ EBUILD torque-1.2.0_p5-r2.ebuild 4885 RMD160 84646b61bf0d1e3ead7f6c0c23018a7ffb9
 MD5 3d491a9ae775b0476c29ad4c9b6b72e6 torque-1.2.0_p5-r2.ebuild 4885
 RMD160 84646b61bf0d1e3ead7f6c0c23018a7ffb9b3d97 torque-1.2.0_p5-r2.ebuild 4885
 SHA256 a2e4fe8eedcaac6033233c091e5c42242863e8a2bf1a18d74d2d83f19587a2e6 torque-1.2.0_p5-r2.ebuild 4885
+EBUILD torque-2.1.2-r1.ebuild 3888 RMD160 8e9c686f14a881804e6f7ea2410b4a49e58e1245 SHA1 a4e99c99214e2bc14c73bc4f3faf5d4858282e02 SHA256 93d3f76c98520de5e34d1daef27636f519904358a1d0372adde05168e8e259ef
+MD5 fc4304396db75525eb32882f0852c338 torque-2.1.2-r1.ebuild 3888
+RMD160 8e9c686f14a881804e6f7ea2410b4a49e58e1245 torque-2.1.2-r1.ebuild 3888
+SHA256 93d3f76c98520de5e34d1daef27636f519904358a1d0372adde05168e8e259ef torque-2.1.2-r1.ebuild 3888
 EBUILD torque-2.1.2.ebuild 3881 RMD160 8d3e7d2947110c5ee14d001a5d99ca53d1f47441 SHA1 867fad9cd388bf4460e0fb8c3a3ae293decc7ac8 SHA256 c10555746a4ce8064af22fd53ee1ce51ad258b248edd9ed0eb638aca1db86430
 MD5 372bf66e7e371331b746ac0609214157 torque-2.1.2.ebuild 3881
 RMD160 8d3e7d2947110c5ee14d001a5d99ca53d1f47441 torque-2.1.2.ebuild 3881
 SHA256 c10555746a4ce8064af22fd53ee1ce51ad258b248edd9ed0eb638aca1db86430 torque-2.1.2.ebuild 3881
-MISC ChangeLog 5774 RMD160 55f5d5c952678b0d383a4e7d134df7ef25fa1d05 SHA1 ba97118ab2b36ae58870e1dd37e34375d3813a0a SHA256 9b869dd0f9a93e9a929cbdd7e46b6d1f4b1731c299c2e75ea354df9079e38229
-MD5 205e843aa0232ebdd77eca02d194002c ChangeLog 5774
-RMD160 55f5d5c952678b0d383a4e7d134df7ef25fa1d05 ChangeLog 5774
-SHA256 9b869dd0f9a93e9a929cbdd7e46b6d1f4b1731c299c2e75ea354df9079e38229 ChangeLog 5774
+MISC ChangeLog 6005 RMD160 e8115b43e9e1ef6ef81acea8519cd4bbbe514d52 SHA1 ff688c3a3618319fac4f520994bdfa9d35c856b2 SHA256 49c5c56a7316957f766df04a3d9d1f7172068ccc31a6d83faffa24bfec2277a7
+MD5 c589010f3218b3208a6c60e97876c894 ChangeLog 6005
+RMD160 e8115b43e9e1ef6ef81acea8519cd4bbbe514d52 ChangeLog 6005
+SHA256 49c5c56a7316957f766df04a3d9d1f7172068ccc31a6d83faffa24bfec2277a7 ChangeLog 6005
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 metadata.xml 160
@@ -49,3 +53,6 @@ SHA256 200f21573eb80cf1cd88105b9e433582f6a86f8b3aee97cf7e2c0769f2059411 files/di
 MD5 d53296cdc58c020b280c7c1d41f60b01 files/digest-torque-2.1.2 241
 RMD160 9c81b5aaae697d1e5a7185e75dca97f462a13e6c files/digest-torque-2.1.2 241
 SHA256 6b0a8e9fd78aa9b11935faff694c105b1cd65af0a1aaabf2981d712879d4e060 files/digest-torque-2.1.2 241
+MD5 d53296cdc58c020b280c7c1d41f60b01 files/digest-torque-2.1.2-r1 241
+RMD160 9c81b5aaae697d1e5a7185e75dca97f462a13e6c files/digest-torque-2.1.2-r1 241
+SHA256 6b0a8e9fd78aa9b11935faff694c105b1cd65af0a1aaabf2981d712879d4e060 files/digest-torque-2.1.2-r1 241
diff --git a/sys-cluster/torque/files/digest-torque-2.1.2-r1 b/sys-cluster/torque/files/digest-torque-2.1.2-r1
new file mode 100644
index 000000000000..5bb1ccd8379b
--- /dev/null
+++ b/sys-cluster/torque/files/digest-torque-2.1.2-r1
@@ -0,0 +1,3 @@
+MD5 f1b37efb5d4770a0105c66294a05d140 torque-2.1.2.tar.gz 2686724
+RMD160 7ba5cf4b4655d6e77c705be30c539380ca5863c1 torque-2.1.2.tar.gz 2686724
+SHA256 c7bade897fc12f27f128e4081c8ed1f3137bf42684ca239c48b18eb01314710a torque-2.1.2.tar.gz 2686724
diff --git a/sys-cluster/torque/torque-2.1.2-r1.ebuild b/sys-cluster/torque/torque-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..cfd9cf18d061
--- /dev/null
+++ b/sys-cluster/torque/torque-2.1.2-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.1.2-r1.ebuild,v 1.1 2006/09/26 05:10:51 dberkholz Exp $
+
+
+inherit autotools flag-o-matic eutils
+
+MY_P="${P/_}"
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.clusterresources.com/products/torque/"
+SRC_URI="http://www.clusterresources.com/downloads/${PN}/${MY_P}.tar.gz"
+
+LICENSE="openpbs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="tk scp server"
+PROVIDE="virtual/pbs"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="virtual/libc
+	sys-libs/ncurses
+	sys-libs/readline
+	tk? ( dev-lang/tk )
+	!virtual/pbs"
+
+DEPEND="${DEPEND_COMMON}
+	sys-apps/ed"
+
+RDEPEND="${DEPEND_COMMON}
+	scp? ( net-misc/openssh )
+	!scp? ( net-misc/netkit-rsh )"
+
+PDEPEND=">=sys-cluster/openpbs-common-1.1.1"
+
+S="${WORKDIR}/${MY_P}"
+
+SPOOL_LOCATION="/var/spool" # this needs to move to /var later on
+PBS_SERVER_HOME="${SPOOL_LOCATION}/PBS/"
+
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch ${FILESDIR}/${PN}-setuid-safety.patch
+}
+
+
+
+src_compile() {
+
+	local myconf
+	if use server; then
+		myconf="--enable-server  --with-default-server=$(hostname)"
+	elif [[ -n ${PBS_SERVER_NAME} ]]; then
+		myconf="--disable-server --with-default-server=${PBS_SERVER_NAME}"
+	else
+		myconf="--disable-server --with-default-server=$(hostname)"
+	fi
+
+	if use scp; then
+		myconf="${myconf} --with-rcp=scp"
+	else
+		myconf="${myconf} --with-rcp=mom_rcp"
+	fi
+
+	econf \
+		$(use_enable tk gui) \
+		--libdir="\${exec_prefix}/$(get_libdir)/pbs/lib" \
+		--with-server-home=${PBS_SERVER_HOME} \
+		--with-environ=/etc/pbs_environment \
+		${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="${SPOOL_LOCATION}"
+	local h="${PBS_SERVER_HOME}"
+	local sp="${h}/server_priv"
+	einfo "Building spool directory under ${D}${h}"
+	local a d m
+	for a in \
+			0755:${s} 0755:${h} 0755:${h}/aux 0700:${h}/checkpoint \
+			0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs \
+			0755:${h}/sched_logs 0750:${h}/sched_priv \
+			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 \
+			1777:${h}/spool 1777:${h}/undelivered ;
+	do
+		d="${a/*:}"
+		m="${a/:*}"
+		if [[ ! -d "${root}${d}" ]]; then
+			install -d -m${m} "${root}${d}"
+		else
+			chmod ${m} "${root}${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 doc/admin_guide.ps
+
+	# this file MUST exist for PBS/Torque to work
+	# but try to preserve any customatizations that the user has made
+	dodir /etc
+	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
+		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
+	else
+		touch "${D}"/etc/pbs_environment
+	fi
+
+	if [ -f "${ROOT}var/spool/PBS/server_name" ]; then
+		cp "${ROOT}var/spool/PBS/server_name" "${D}/var/spool/PBS/server_name"
+	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
+}
+
+pkg_postinst() {
+	# make sure the directories exist
+	pbs_createspool "${ROOT}"
+	[ ! -f "${ROOT}etc/pbs_environment" ] && \
+		touch "${ROOT}etc/pbs_environment"
+}