ppc support

3 files changed, 47 insertions, 7 deletions

diff --git a/dev-util/cvsup/ChangeLog b/dev-util/cvsup/ChangeLog
index 22f3116b6e4a..46281d6f5d72 100644
--- a/dev-util/cvsup/ChangeLog
+++ b/dev-util/cvsup/ChangeLog
@@ -1,9 +1,12 @@
 # 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.9 2003/04/17 13:40:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/ChangeLog,v 1.10 2003/07/17 23:23:15 vapier Exp $
 
 *cvsup-16.1h (17 Apr 2003)
 
+  17 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added ppc patch so ppc people can emerge cvsup!
+
   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.
diff --git a/dev-util/cvsup/cvsup-16.1h.ebuild b/dev-util/cvsup/cvsup-16.1h.ebuild
index 2ea021ad8fe7..d65321b47899 100644
--- a/dev-util/cvsup/cvsup-16.1h.ebuild
+++ b/dev-util/cvsup/cvsup-16.1h.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.1h.ebuild,v 1.2 2003/07/12 14:28:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsup/cvsup-16.1h.ebuild,v 1.3 2003/07/17 23:23:15 vapier Exp $
 
 S=${WORKDIR}
 MY_P="${P/-/-snap-}"
@@ -16,16 +16,23 @@ HOMEPAGE="http://www.cvsup.org/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 DEPEND="virtual/glibc
-	dev-util/yacc"
+	dev-util/yacc
+	ppc? ( dev-lang/cm3 )"
 RDEPEND="virtual/glibc"
 
 seduse() {
 	[ -z "`use ${1}`" ] && echo "${2}" || echo ":"
 }
 
+src_unpack() {
+	unpack ${A}
+	[ ${ARCH} == "ppc" ] && epatch ${FILESDIR}/${PV}-ppc.patch
+}
+
 src_compile() {
+	if [ ${ARCH} != "ppc" ] ; then
 	########################
 	### BEGIN EZM3 SETUP ###
 	########################
@@ -54,6 +61,7 @@ src_compile() {
 	#	newer build system uses this variable and having it breaks it
 	cd ${S}/${EZM3}
 	env -u CFLAGS -u P make || die "ezm3 compile failed"
+	fi
 
 	#########################
 	### BEGIN CVSUP SETUP ###
@@ -78,9 +86,6 @@ src_compile() {
 
 	# then we compile cvsup
 	env PATH="${S}/${EZM3}-install/bin:${PATH}" make || die "cvsup compile failed"
-	# check to make sure all the binaries compiled ... the make doesnt return
-	# if an error was encountered ... it just keeeeeeeeeps going :/
-	[ `find ${S}/${MY_P} -perm +1 -type f | wc -l` == 9 ] || die "cvsup compile failed"
 
 	# now we do up the html pages ...
 	cd ${S}/${MY_P}/doc
diff --git a/dev-util/cvsup/files/16.1h-ppc.patch b/dev-util/cvsup/files/16.1h-ppc.patch
new file mode 100644
index 000000000000..c7ab29dea2c3
--- /dev/null
+++ b/dev-util/cvsup/files/16.1h-ppc.patch
@@ -0,0 +1,32 @@
+diff -ur cvsup-snap-16.1h/suplib/src/m3makefile wagner-cvsup/suplib/src/m3makefile
+--- cvsup-snap-16.1h/suplib/src/m3makefile	2003-03-04 13:13:12.000000000 -0500
++++ wagner-cvsup/suplib/src/m3makefile	2003-07-17 19:11:22.000000000 -0400
+@@ -45,6 +45,7 @@
+ 
+ readonly DevTPieces = {
+   "LINUXLIBC6" : [ "dev_t_linux" ],
++  "PPC_LINUX"  : [ "dev_t_linux" ],
+   "default"    : [ "dev_t_posix" ]
+ }
+ 
+diff -ur cvsup-snap-16.1h/suptcp/src/POSIX/SupTCP.m3 wagner-cvsup/suptcp/src/POSIX/SupTCP.m3
+--- cvsup-snap-16.1h/suptcp/src/POSIX/SupTCP.m3	2003-04-06 19:48:58.000000000 -0400
++++ wagner-cvsup/suptcp/src/POSIX/SupTCP.m3	2003-07-17 19:11:24.000000000 -0400
+@@ -18,6 +18,7 @@
+ IMPORT SupTCPHack AS TCPHack;
+ IMPORT SupTCPPosix AS TCPPosix;
+ FROM Ctypes IMPORT char, int;
++IMPORT IO;
+ 
+ REVEAL
+   Connector = MUTEX BRANDED "SupTCP.Connector" OBJECT
+@@ -201,6 +202,9 @@
+         IF TCPHack.RefetchError(fd) THEN seenBadFBug := TRUE END;
+       END;
+     END;
++    IO.Put("CheckConnect: errno=");
++    IO.PutInt(Cerrno.GetErrno());
++    IO.Put("\n");
+     CASE Cerrno.GetErrno() OF
+     | Uerror.EISCONN => RETURN TRUE;
+     | Uerror.EADDRNOTAVAIL,  Uerror.ECONNREFUSED, Uerror.EINVAL,