version bump

6 files changed, 37 insertions, 33 deletions

diff --git a/dev-util/cvsup/ChangeLog b/dev-util/cvsup/ChangeLog
index 7e6c71b7ea57..22f3116b6e4a 100644
--- a/dev-util/cvsup/ChangeLog
+++ b/dev-util/cvsup/ChangeLog
@@ -1,32 +1,28 @@
 # ChangeLog for dev-util/cvsup
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/ChangeLog,v 1.8 2003/02/12 06:40:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/ChangeLog,v 1.9 2003/04/17 13:40:29 vapier Exp $
 
-*cvsup-16.1e-r2 (4 Dec. 2002)
+*cvsup-16.1h (17 Apr 2003)
 
-  26 Jan. 2002; Grant Goodyear <g2boojum@gentoo.org> cvsup-16.1e-r2.ebuild :
+  17 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump for both cvsup and the ezm3 compiler ...
+  New ezm3 is based off of gcc-3.2.1.
 
-  Added support files so we can mirror portage using cvsup.
+*cvsup-16.1e-r2 (04 Dec 2002)
 
-*cvsup-16.1e-r1 (4 Dec. 2002)
+  26 Jan 2002; Grant Goodyear <g2boojum@gentoo.org> cvsup-16.1e-r2.ebuild :
+  Added support files so we can mirror portage using cvsup.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*cvsup-16.1e-r1 (4 Dec. 2002)
+*cvsup-16.1e-r1 (04 Dec 2002)
 
   4 Dec. 2002; Grant Goodyear <g2boojum@gentoo.org> cvsup-16.1e-r1.ebuild :
-
   Added new version that builds from source.  Keywording as ~x86 and nothing else
   until it gets tested.
 
-*cvsup-16.1e (19 August 2002)
-
-  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, cvsup-16.1e.ebuild :
+*cvsup-16.1e (18 Feb 2002)
 
+  19 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, cvsup-16.1e.ebuild :
   Added -ppc to the keywords.
 
-*cvsup-16.1e (18 Feb 2002)
-
   18 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog. Created package.
diff --git a/dev-util/cvsup/cvsup-16.1e-r2.ebuild b/dev-util/cvsup/cvsup-16.1e-r2.ebuild
index 1d30f8795326..0e1b81ed7222 100644
--- a/dev-util/cvsup/cvsup-16.1e-r2.ebuild
+++ b/dev-util/cvsup/cvsup-16.1e-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1e-r2.ebuild,v 1.3 2003/02/13 11:49:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1e-r2.ebuild,v 1.4 2003/04/17 13:40:29 vapier Exp $
 
 S=${WORKDIR}
 MY_P="${P/-/-snap-}"
@@ -116,5 +116,4 @@ src_install() {
 	newins ${FILESDIR}/cvsupd.confd cvsupd
 
 	dodir /var/cvsup
-	
 }
diff --git a/dev-util/cvsup/cvsup-16.1e.ebuild b/dev-util/cvsup/cvsup-16.1e.ebuild
index e5980081fb7b..6653b9054203 100644
--- a/dev-util/cvsup/cvsup-16.1e.ebuild
+++ b/dev-util/cvsup/cvsup-16.1e.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1e.ebuild,v 1.8 2003/02/13 11:49:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1e.ebuild,v 1.9 2003/04/17 13:40:29 vapier Exp $
 
-S=${WORKDIR}
 DESCRIPTION="a faster alternative to cvs. binary version"
 SRC_URI="http://people.freebsd.org/~jdp/s1g/debian/${P}-LINUXLIBC6-gui.tar.gz"
 HOMEPAGE="http://people.freebsd.org/~jdp/s1g/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 -ppc sparc "
+KEYWORDS="x86 -ppc sparc"
 
-src_install() {							   
+S=${WORKDIR}
 
-	cd ${S}
+src_install() {							   
 	exeinto /opt/cvsup
 	doexe cvsup*
 	
 	dodoc License
 	
 	insinto /etc/env.d
-	doins $FILESDIR/99cvsup
-
+	doins ${FILESDIR}/99cvsup
 }
diff --git a/dev-util/cvsup/cvsup-16.1e-r1.ebuild b/dev-util/cvsup/cvsup-16.1h.ebuild
index ef1fd918a524..0560a48334b1 100644
--- a/dev-util/cvsup/cvsup-16.1e-r1.ebuild
+++ b/dev-util/cvsup/cvsup-16.1h.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1e-r1.ebuild,v 1.2 2003/02/13 11:49:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1h.ebuild,v 1.1 2003/04/17 13:40:29 vapier Exp $
 
 S=${WORKDIR}
 MY_P="${P/-/-snap-}"
-EZM3="ezm3-1.0"
+EZM3="ezm3-1.1"
 EZM3_TARGET="LINUXLIBC6"
 EZM3_INSTALL="${S}/${EZM3}-install"	#// anywhere or having a trailing / makes the compile dies
 
 DESCRIPTION="a faster alternative to cvs"
-SRC_URI="http://people.freebsd.org/~jdp/s1g/${MY_P}.tar.gz
+SRC_URI="ftp://ftp3.freebsd.org/pub/FreeBSD/development/CVSup/sources/${MY_P}.tar.gz
 	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/${EZM3}-src.tar.bz2
 	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/${EZM3}-${EZM3_TARGET}-boot.tar.bz2"
 HOMEPAGE="http://www.cvsup.org/"
@@ -50,8 +50,10 @@ src_compile() {
 	# we clear the CFLAGS because:
 	#	(1) higher optimizations cause issues
 	#	(2) it doesnt matter ... we arent installing the compiler ...
+	# we clea the P because:
+	#	newer build system uses this variable and having it breaks it
 	cd ${S}/${EZM3}
-	env CFLAGS="" make || die "ezm3 compile failed"
+	env -u CFLAGS -u P make || die "ezm3 compile failed"
 
 	#########################
 	### BEGIN CVSUP SETUP ###
@@ -105,6 +107,15 @@ src_install() {
 
 	dodoc ${S}/{Acknowledgments,Announce,Blurb,ChangeLog,License,Install}
 
-	dodir ${S}/etc/cvsup
-	insinto ${S}/etc/cvsup
+	dodir /etc/cvsup
+	insinto /etc/cvsup
+	doins ${FILESDIR}/gentoo.sup
+	doins ${FILESDIR}/gentoo_mirror.sup
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/cvsupd.rc cvsupd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/cvsupd.confd cvsupd
+
+	dodir /var/cvsup
 }
diff --git a/dev-util/cvsup/files/digest-cvsup-16.1e-r1 b/dev-util/cvsup/files/digest-cvsup-16.1e-r1
deleted file mode 100644
index 3ce08de952e9..000000000000
--- a/dev-util/cvsup/files/digest-cvsup-16.1e-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1fc0ce8660b7fdc350893d4ea2458ceb cvsup-snap-16.1e.tar.gz 430594
-MD5 7f85f69e420b00a51481dad92f7eb749 ezm3-1.0-src.tar.bz2 6128550
-MD5 d2889caf3bb8fe2d50f40cfcc17908b9 ezm3-1.0-LINUXLIBC6-boot.tar.bz2 1345000
diff --git a/dev-util/cvsup/files/digest-cvsup-16.1h b/dev-util/cvsup/files/digest-cvsup-16.1h
new file mode 100644
index 000000000000..6af1308ea89e
--- /dev/null
+++ b/dev-util/cvsup/files/digest-cvsup-16.1h
@@ -0,0 +1,3 @@
+MD5 b100ace98a41aa9f3d3e75b0d3c245b0 cvsup-snap-16.1h.tar.gz 430951
+MD5 0cb8d2af3784142144c01ffac4c0ffff ezm3-1.1-src.tar.bz2 10705295
+MD5 f2efe85be7676944c537aa729f9cb17e ezm3-1.1-LINUXLIBC6-boot.tar.bz2 1444815