Update to respect PVM_ROOT, wherever it is (#47860). Also general fixups.

7 files changed, 90 insertions, 12 deletions

diff --git a/sys-cluster/xpvm/ChangeLog b/sys-cluster/xpvm/ChangeLog
index 045880b19d4a..a25376d6f384 100644
--- a/sys-cluster/xpvm/ChangeLog
+++ b/sys-cluster/xpvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/xpvm
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/xpvm/ChangeLog,v 1.5 2003/09/21 23:15:38 tantive Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/xpvm/ChangeLog,v 1.6 2004/04/25 21:58:41 spyderous Exp $
+
+*xpvm-1.2.5-r3 (25 Apr 2004)
+
+  25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; +xpvm-1.2.5-r3.ebuild:
+  Update to respect PVM_ROOT, wherever it is (#47860). Also general fixups.
 
   22 Sep 2003; Michael Imhof <tantive@gentoo.org> xpvm-1.2.5-r2.ebuild:
   Unmasked for x86.
diff --git a/sys-cluster/xpvm/Manifest b/sys-cluster/xpvm/Manifest
index 626160aade2d..c1f2bea27a24 100644
--- a/sys-cluster/xpvm/Manifest
+++ b/sys-cluster/xpvm/Manifest
@@ -1,9 +1,11 @@
-MD5 f98f1e822673bb15499b1a1f0f4046cb xpvm-1.2.5.ebuild 1516
+MD5 2cdca7676e3b96b2539042fc17f34520 ChangeLog 991
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
-MD5 99ba9750827ff9e263e2b653555099a6 ChangeLog 804
-MD5 096a86699882676e4ca0791e683faa08 xpvm-1.2.5-r2.ebuild 1422
-MD5 c27701d17dc82621b8d26122015fc9f0 xpvm-1.2.5-r1.ebuild 1437
+MD5 8326583e216d3fc7081d923b8b94e5bc xpvm-1.2.5-r1.ebuild 1437
+MD5 4b39ecd507c3c5452842c2085be03da8 xpvm-1.2.5-r2.ebuild 1422
+MD5 b3d43b876f0059fc6b6b9779c8fe6ce5 xpvm-1.2.5.ebuild 1518
+MD5 c84cdebd67b538ed6fd193435395890a xpvm-1.2.5-r3.ebuild 1555
+MD5 915d49a269c55c9d68cf0d7d30f1b272 files/digest-xpvm-1.2.5 63
+MD5 915d49a269c55c9d68cf0d7d30f1b272 files/digest-xpvm-1.2.5-r1 63
 MD5 915d49a269c55c9d68cf0d7d30f1b272 files/digest-xpvm-1.2.5-r2 63
 MD5 d35a792494704198c2d97ff3e4b9e033 files/xpvm-1.2.5-gentoo.diff 2904
-MD5 915d49a269c55c9d68cf0d7d30f1b272 files/digest-xpvm-1.2.5-r1 63
-MD5 915d49a269c55c9d68cf0d7d30f1b272 files/digest-xpvm-1.2.5 63
+MD5 915d49a269c55c9d68cf0d7d30f1b272 files/digest-xpvm-1.2.5-r3 63
diff --git a/sys-cluster/xpvm/files/digest-xpvm-1.2.5-r3 b/sys-cluster/xpvm/files/digest-xpvm-1.2.5-r3
new file mode 100644
index 000000000000..b9694694f22c
--- /dev/null
+++ b/sys-cluster/xpvm/files/digest-xpvm-1.2.5-r3
@@ -0,0 +1 @@
+MD5 7b20143cb2ff61e3cb28baf8f9cb2770 XPVM.src.1.2.5.tgz 196004
diff --git a/sys-cluster/xpvm/xpvm-1.2.5-r1.ebuild b/sys-cluster/xpvm/xpvm-1.2.5-r1.ebuild
index 2e232483a25c..eec00ed4ac24 100644
--- a/sys-cluster/xpvm/xpvm-1.2.5-r1.ebuild
+++ b/sys-cluster/xpvm/xpvm-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 
diff --git a/sys-cluster/xpvm/xpvm-1.2.5-r2.ebuild b/sys-cluster/xpvm/xpvm-1.2.5-r2.ebuild
index 54e52d152264..385280d3a5cc 100644
--- a/sys-cluster/xpvm/xpvm-1.2.5-r2.ebuild
+++ b/sys-cluster/xpvm/xpvm-1.2.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 
diff --git a/sys-cluster/xpvm/xpvm-1.2.5-r3.ebuild b/sys-cluster/xpvm/xpvm-1.2.5-r3.ebuild
new file mode 100644
index 000000000000..470f93755c07
--- /dev/null
+++ b/sys-cluster/xpvm/xpvm-1.2.5-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="XPVM: A graphical console and monitor for PVM"
+SRC_URI="http://www.netlib.org/pvm3/xpvm/XPVM.src.1.2.5.tgz"
+HOMEPAGE="http://www.csm.ornl.gov/pvm/pvm_home.html"
+IUSE=""
+
+DEPEND=">=sys-cluster/pvm-3.4.1-r1
+	dev-lang/tcl
+	dev-lang/tk"
+RDEPEND=""
+
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="LGPL-2"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/xpvm-1.2.5-gentoo.diff
+}
+
+src_compile() {
+	export XPVM_ROOT="${WORKDIR}/xpvm"
+
+	cd ${WORKDIR}/xpvm
+
+	if [ -z "${PVM_ROOT}" ]
+	then
+		die "PVM_ROOT variable not set. Please run env-update and source /etc/profile."
+	elif [ -z "${PVM_ARCH}" ]
+	then
+		die "PVM_ARCH variable not set. Please run env-update and source /etc/profile."
+	fi
+
+	emake xpvm || die
+}
+
+src_install() {
+	XPVM_ROOT=${PVM_ROOT}/xpvm
+
+	cd ${WORKDIR}/xpvm
+	dodir ${PVM_ROOT}/xpvm
+	dodir ${PVM_ROOT}/bin/${PVM_ARCH}
+	dodir /usr/bin
+
+	#create symlinks to xpvm binary
+	dosym ${XPVM_ROOT}/src/${PVM_ARCH}/xpvm ${PVM_ROOT}/bin/${PVM_ARCH}/xpvm
+	dosym ${XPVM_ROOT}/src/${PVM_ARCH}/xpvm /usr/bin/xpvm
+
+	#install headers and libs and binary
+	cp ${WORKDIR}/xpvm ${D}/${PVM_ROOT} -r
+
+	#environment variables:
+	touch ${T}/97xpvm
+	echo XPVM_ROOT=/usr/local/pvm3/xpvm/src >> ${T}/97xpvm
+	insinto /etc/env.d
+	doins ${T}/97xpvm
+
+	dodoc README
+}
+
+pkg_postinst() {
+	ewarn "Environment Variables have changed. Do not forget to reboot or perform"
+	ewarn "source /etc/profile before using xpvm !"
+}
diff --git a/sys-cluster/xpvm/xpvm-1.2.5.ebuild b/sys-cluster/xpvm/xpvm-1.2.5.ebuild
index 190cd996f8ce..50348a7428fc 100644
--- a/sys-cluster/xpvm/xpvm-1.2.5.ebuild
+++ b/sys-cluster/xpvm/xpvm-1.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/xpvm/xpvm-1.2.5.ebuild,v 1.2 2003/06/26 15:47:38 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/xpvm/xpvm-1.2.5.ebuild,v 1.3 2004/04/25 21:58:41 spyderous Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="XPVM: A graphical console and monitor for PVM"