Bug fixes for environment vars

5 files changed, 81 insertions, 9 deletions

diff --git a/dev-util/perforce/ChangeLog b/dev-util/perforce/ChangeLog
index b3df559bfd73..2316f29d5625 100644
--- a/dev-util/perforce/ChangeLog
+++ b/dev-util/perforce/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/perforce
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/perforce/ChangeLog,v 1.7 2004/06/25 02:42:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perforce/ChangeLog,v 1.8 2004/06/26 22:04:14 stuart Exp $
+
+*perforce-2003.1-r1 (26 Jun 2004)
+
+  26 Jun 2004; Stuart Herbert <stuart@gentoo.org>
+  files/perforce-2003.1/50perforce, +perforce-2003.1-r1.ebuild:
+  Fixes for bugs #52830 & #52831
 
   19 Feb 2004; root <root@gentoo.org> :
   Updated digests; files were changed by Perforce
diff --git a/dev-util/perforce/Manifest b/dev-util/perforce/Manifest
index a28613e51fdc..bd667b859653 100644
--- a/dev-util/perforce/Manifest
+++ b/dev-util/perforce/Manifest
@@ -1,13 +1,15 @@
-MD5 df5e6f98d3d4a33dacd00685b1bef317 perforce-2002.2-r1.ebuild 1556
-MD5 e1abdf31664d98f5c60b228ee3bba65e perforce-2003.1.ebuild 1469
-MD5 3f91192b941afbfa6e229372973bcb97 ChangeLog 1433
+MD5 465d9d6c42d0a9d5b8c0d5f31707b460 ChangeLog 1616
 MD5 71da003bb2109fed15aff6635287c6a6 metadata.xml 222
+MD5 df5e6f98d3d4a33dacd00685b1bef317 perforce-2002.2-r1.ebuild 1556
 MD5 365e14c3fdc9427d68ebbf03a9ed854b perforce-2002.2.ebuild 1478
+MD5 e1abdf31664d98f5c60b228ee3bba65e perforce-2003.1.ebuild 1469
+MD5 e1abdf31664d98f5c60b228ee3bba65e perforce-2003.1-r1.ebuild 1469
 MD5 71ff013c747258365dfd982b619aaa15 files/digest-perforce-2002.2 342
-MD5 b9b08fb5ced4f4f3e798e90b7ecce0d7 files/digest-perforce-2003.1 199
 MD5 71ff013c747258365dfd982b619aaa15 files/digest-perforce-2002.2-r1 342
+MD5 b9b08fb5ced4f4f3e798e90b7ecce0d7 files/digest-perforce-2003.1 199
+MD5 b9b08fb5ced4f4f3e798e90b7ecce0d7 files/digest-perforce-2003.1-r1 199
 MD5 7a54cc6c6d53acca3c67df75fb125100 files/perforce-2002.2/50perforce 95
-MD5 7a54cc6c6d53acca3c67df75fb125100 files/perforce-2003.1/50perforce 95
+MD5 26b16f125bf7cefe93c70125ade6f29b files/perforce-2003.1/50perforce 25
 MD5 848a2cb4e6486e833a0015794c7456c8 files/perforce-2002.2/conf.d/perforce 70
 MD5 6e2158b2a12cb91af134809d65b5af78 files/perforce-2002.2/init.d/perforce 1059
 MD5 848a2cb4e6486e833a0015794c7456c8 files/perforce-2003.1/conf.d/perforce 70
diff --git a/dev-util/perforce/files/digest-perforce-2003.1-r1 b/dev-util/perforce/files/digest-perforce-2003.1-r1
new file mode 100644
index 000000000000..d48be58c3425
--- /dev/null
+++ b/dev-util/perforce/files/digest-perforce-2003.1-r1
@@ -0,0 +1,4 @@
+MD5 99137d11102c457fd2e32838cf221a9e p4d 1165464
+MD5 8ec46fb1fcc0c2a1b4678a215e2b7299 p4web 1441585
+MD5 1daa79d4fc3c1422d32d5193c9006f8c p4ftpd 606540
+MD5 381a27c69d707aa3498602a1c216a8d3 p4d.1 4529
diff --git a/dev-util/perforce/files/perforce-2003.1/50perforce b/dev-util/perforce/files/perforce-2003.1/50perforce
index e2fcc607a662..8f4811b2bea8 100644
--- a/dev-util/perforce/files/perforce-2003.1/50perforce
+++ b/dev-util/perforce/files/perforce-2003.1/50perforce
@@ -1,3 +1 @@
-PATH=/opt/perforce/bin
-ROOTPATH=/opt/perforce/bin:/opt/perforce/sbin
-MANPATH=/opt/perforce/man
+P4ROOT=/var/lib/perforce
diff --git a/dev-util/perforce/perforce-2003.1-r1.ebuild b/dev-util/perforce/perforce-2003.1-r1.ebuild
new file mode 100644
index 000000000000..c6025e4fb1ef
--- /dev/null
+++ b/dev-util/perforce/perforce-2003.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perforce/perforce-2003.1-r1.ebuild,v 1.1 2004/06/26 22:04:14 stuart Exp $
+
+inherit eutils
+
+DESCRIPTION="Daemon for a commercial version control system"
+HOMEPAGE="http://www.perforce.com/"
+URI_BASE="ftp://ftp.perforce.com/perforce/r03.1/"
+BIN_BASE="$URI_BASE/bin.linux24x86"
+DOC_BASE="$URI_BASE/doc"
+SRC_URI="${BIN_BASE}/p4d ${BIN_BASE}/p4web ${BIN_BASE}/p4ftpd ${DOC_BASE}/man/p4d.1"
+
+LICENSE="perforce.pdf"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+RESTRICT="nomirror nostrip"
+
+DEPEND="virtual/glibc"
+
+S=${WORKDIR}
+
+MY_FILES=${FILESDIR}/perforce-2003.1/
+
+src_unpack() {
+	# we have to copy all of the files from $DISTDIR, otherwise we get
+	# sandbox violations when trying to install
+
+	for x in p4web p4d p4ftpd p4d.1 ; do
+		cp ${DISTDIR}/$x .
+	done
+}
+
+src_install() {
+	enewuser perforce
+	enewgroup perforce
+
+	dosbin p4d
+	dosbin p4web
+	dosbin p4ftpd
+
+	fowners perforce:perforce /usr/sbin/p4d
+	fowners perforce:perforce /usr/sbin/p4ftpd
+	fowners perforce:perforce /usr/sbin/p4web
+
+	mkdir -p ${D}/var/log
+	touch ${D}/var/log/perforce
+	fowners perforce:perforce /var/log/perforce
+
+	doman p4d.1
+
+	keepdir /var/lib/perforce
+	fowners perforce:perforce /var/lib/perforce
+
+	exeinto /etc/init.d
+	doexe ${MY_FILES}/init.d/perforce
+	insinto /etc/conf.d
+	doins ${MY_FILES}/conf.d/perforce
+	insinto /etc/env.d
+	doins ${MY_FILES}/50perforce
+}