7 files changed, 179 insertions, 0 deletions
diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
new file mode 100644
index 000000000000..bc5bc70b74ac
--- /dev/null
+++ b/sys-apps/s390-tools/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for sys-apps/s390-tools
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.1 2004/04/18 03:18:26 randy Exp $
+
+*s390-tools-1.2.4 (17 Apr 2004)
+
+  17 Apr 2004; Michael McCabe <randy@gentoo.org> +s390-tools-1.2.4.ebuild:
+  Initial commit
+
+*s390-tools-1.2.4 (13 Apr 2004)
+
+  13 Apr 2004; Jochen Eisinger <jochen@penguin-breeder.org> s390-tools-1.2.4:
+  initial ebuild. Patches to use static libvtoc & default to ucd-snmp.
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
new file mode 100644
index 000000000000..51ffd39cab2d
--- /dev/null
+++ b/sys-apps/s390-tools/Manifest
@@ -0,0 +1,5 @@
+MD5 201f813970084c2d239cf72fb7c119f8 s390-tools-1.2.4.ebuild 1316
+MD5 34ba30d69799537fb145c648510ed074 ChangeLog 436
+MD5 d27d451e8020585ffb997a66a96b30e4 files/digest-s390-tools-1.2.4 278
+MD5 5237af379f668ca4e112dd27e11ecfa1 files/s390-tools-1.2.4-ucdsnmp.diff 436
+MD5 2de7c8793f6dbffe92910ab4ab08e318 files/s390-tools-1.2.4-vtoc.diff 2102
diff --git a/sys-apps/s390-tools/files/digest-s390-tools-1.2.4 b/sys-apps/s390-tools/files/digest-s390-tools-1.2.4
new file mode 100644
index 000000000000..7f534c0dfa34
--- /dev/null
+++ b/sys-apps/s390-tools/files/digest-s390-tools-1.2.4
@@ -0,0 +1,4 @@
+MD5 c4e221af379bfd1c94452dbee787045f s390-tools-1.2.4-june2003.tar.gz 771601
+MD5 79d244d5adbb048f1aa0d90ee9e187e4 busybox-0.60.5.tar.bz2 626209
+MD5 a7ced9d6edaba3a000ccc5200e09b90d e2fsprogs-1.32.tar.gz 2894603
+MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
diff --git a/sys-apps/s390-tools/files/s390-tools-1.2.4-ucdsnmp.diff b/sys-apps/s390-tools/files/s390-tools-1.2.4-ucdsnmp.diff
new file mode 100644
index 000000000000..5fd60ff52629
--- /dev/null
+++ b/sys-apps/s390-tools/files/s390-tools-1.2.4-ucdsnmp.diff
@@ -0,0 +1,11 @@
+--- ./osasnmpd/Makefile.orig	2003-10-16 08:14:25.000000000 +0000
++++ ./osasnmpd/Makefile	2004-04-07 15:18:26.000000000 +0000
+@@ -2,7 +2,7 @@
+ include ../common.mak
+ 
+ ifeq ($(strip $(shell which net-snmp-config 2>/dev/null)),)
+-LIBS = -lucdagent -lucdmibs -lsnmp -lrpmdb -lrpm -lpopt -lrpmio -lwrap -lnsl -ldl -lcrypto
++LIBS = -lwrap -lcrypto -lucdagent -lucdmibs -lsnmp
+ CFLAGS = -g -Wall
+ else
+ LIBS = `net-snmp-config --agent-libs` 
diff --git a/sys-apps/s390-tools/files/s390-tools-1.2.4-vtoc.diff b/sys-apps/s390-tools/files/s390-tools-1.2.4-vtoc.diff
new file mode 100644
index 000000000000..4a2b5fe6974b
--- /dev/null
+++ b/sys-apps/s390-tools/files/s390-tools-1.2.4-vtoc.diff
@@ -0,0 +1,76 @@
+--- ./fdasd/Makefile.orig
++++ ./fdasd/Makefile
+@@ -1,33 +1,19 @@
+ # Include common definitions
+ include ../common.mak
+ 
+-CFLAGS        = -Wall
+-LDFLAGS       = -L. -lvtoc
+-
+-SRCS          = fdasd.c
+-LIBSRC        = vtoc.c
+-LIBOBJ        = vtoc.o
++CFLAGS        = -Os -fomit-frame-pointer -Wall
+ 
+ all: fdasd
+ 
+-fdasd: libvtoc.so fdasd.c fdasd.h
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o fdasd $(SRCS)
+-
+-libvtoc.so: vtoc.c
+-	$(CC) $(CFLAGS) -c -fpic $(LIBSRC) -o $(LIBOBJ)
+-	$(CC) -Wall -shared $(LIBOBJ) -o libvtoc.so -W1,-soname=libvtoc.so.1
++fdasd: fdasd.c vtoc.o
++	$(CC) $(CFLAGS) -o fdasd $^
+ 
+-install: libinstall
++install:
+ 	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
+ 	$(STRIP) fdasd
+ 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 700 fdasd $(BINDIR)
+ 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 fdasd.8  $(MANDIR)/man8 
+ 
+-libinstall:
+-	$(INSTALL) -d -m 755 $(LIBDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) libvtoc.so $(LIBDIR)
+-#	ldconfig
+-
+ clean:
+ 	rm -f *.o *.so *~ fdasd core
+ 
+--- ./dasdfmt/Makefile.orig	2004-04-07 15:04:23.000000000 +0000
++++ ./dasdfmt/Makefile	2004-04-07 15:05:22.000000000 +0000
+@@ -2,7 +2,6 @@
+ include ../common.mak
+ 
+ CFLAGS  = -O2 -Wall
+-LDFLAGS = -lvtoc
+ 
+ default: dasdfmt
+ 
+@@ -17,5 +16,5 @@
+ 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 700 dasdfmt   $(BINDIR)
+ 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdfmt.8 $(MANDIR)/man8 
+ 
+-dasdfmt: dasdfmt.c dasdfmt.h vtoc.h
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o dasdfmt dasdfmt.c
++dasdfmt: dasdfmt.c dasdfmt.h vtoc.h ../fdasd/vtoc.o
++	$(CC) $(CFLAGS) -o dasdfmt dasdfmt.c ../fdasd/vtoc.o
+--- ./dasdview/Makefile.orig	2004-04-07 15:05:02.000000000 +0000
++++ ./dasdview/Makefile	2004-04-07 15:05:44.000000000 +0000
+@@ -2,7 +2,6 @@
+ include ../common.mak
+ 
+ CFLAGS  = -Wall -O2
+-LDFLAGS = -lvtoc
+ 
+ default: dasdview
+ 
+@@ -17,5 +16,5 @@
+ 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 700 dasdview   $(BINDIR)
+ 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdview.8 $(MANDIR)/man8 
+ 
+-dasdview: dasdview.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o dasdview dasdview.c
++dasdview: dasdview.c ../fdasd/vtoc.o
++	$(CC) $(CFLAGS) -o dasdview dasdview.c ../fdasd/vtoc.o
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
new file mode 100644
index 000000000000..32a1ee41f548
--- /dev/null
+++ b/sys-apps/s390-tools/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!-- 
+
+This is the example metadata file.
+The root element of this file is <pkgmetadata>. Within this element a 
+number of subelements are allowed: herd, maintainer, and 
+longdescription. herd is a required subelement.
+
+For a full description look at:
+http://www.gentoo.org/proj/en/metastructure/herds
+
+
+Before committing, please remove the comments from this file. They are 
+not relevant for general metadata.xml files.
+-->
+<pkgmetadata>
+<herd>base-system</herd>
+<maintainer>
+  <email>randy@gentoo.org</email>
+</maintainer>
+<!-- <longdescription>A set of user space utilities that should be used 
+together with the  zSeries (s390) Linux kernel and device drivers</longdescription> -->
+</pkgmetadata>
diff --git a/sys-apps/s390-tools/s390-tools-1.2.4.ebuild b/sys-apps/s390-tools/s390-tools-1.2.4.ebuild
new file mode 100644
index 000000000000..bb26096f3626
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-1.2.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.2.4.ebuild,v 1.1 2004/04/18 03:18:26 randy Exp $
+
+STREAM="june2003"
+
+KERNEL_VERSION=2.4.19
+BBOX_VERSION=0.60.5
+E2FS_PROGS_VERSION=1.32
+
+DESCRIPTION="A set of user space utilities that should be used together with the zSeries (s390) Linux kernel and device drivers"
+# must be downloaded from IBM
+SRC_URI="mirror://gentoo/${PN}-${PV}-${STREAM}.tar.gz
+	http://www.busybox.net/downloads/busybox-${BBOX_VERSION}.tar.bz2
+	mirror://sourceforge/e2fsprogs/e2fsprogs-${E2FS_PROGS_VERSION}.tar.gz
+	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${KERNEL_VERSION}.tar.bz2"
+HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/linux390/june2003_recommended.shtml"
+LICENSE="GPL-2"
+KEYWORDS="s390"
+SLOT="0"
+DEPEND="virtual/glibc
+	net-analyzer/ucd-snmp
+	app-admin/genromfs"
+
+PROVIDE="virtual/bootloader"
+
+src_unpack() {
+	unpack "${PN}-${PV}-${STREAM}.tar.gz"
+	cd ${S}; epatch ${FILESDIR}/${P}-vtoc.diff
+	cd ${S}; epatch ${FILESDIR}/${P}-ucdsnmp.diff
+	for tarball in busybox-${BBOX_VERSION}.tar.bz2 \
+			e2fsprogs-${E2FS_PROGS_VERSION}.tar.gz \
+			linux-${KERNEL_VERSION}.tar.bz2 ; do
+		cp ${DISTDIR}/$tarball ${S}/zfcpdump/extern
+	done
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall INSTROOT=${D}
+	prepall
+}
+