From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 29 Oct 2004 22:10:33 +0000 (+0000)
Subject: use virtual/snmp #69451
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6817b0f0924f4f8e740787d53a48249629dcdc1;p=gentoo.git

use virtual/snmp #69451
---

diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 48803e61bb25..6d9f8c0b8ba2 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,10 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 16e59a218300b52b3f9034cac540fe02 ChangeLog 1426
 MD5 084122472fde6b591c7a6474e066f2c8 metadata.xml 811
-MD5 b961963fd44edb14b79031cd210a6b21 s390-tools-1.2.4.ebuild 1427
-MD5 d96f96b8b2eb937fb559638538cc5d0e s390-tools-1.3.0.ebuild 1356
-MD5 b28d7546871ecfec41b98c0ca79c9730 s390-tools-1.3.2.ebuild 1352
-MD5 d27d451e8020585ffb997a66a96b30e4 files/digest-s390-tools-1.2.4 278
-MD5 00a05864b0d4036e98295a43b8b9b843 files/digest-s390-tools-1.3.0 279
-MD5 5237af379f668ca4e112dd27e11ecfa1 files/s390-tools-1.2.4-ucdsnmp.diff 436
-MD5 2de7c8793f6dbffe92910ab4ab08e318 files/s390-tools-1.2.4-vtoc.diff 2102
+MD5 1dafef4a2eb58fd3c4ec50a450819fe6 s390-tools-1.3.2.ebuild 1309
 MD5 f01bfa0d5b9f01bd2a71e521655378f7 files/digest-s390-tools-1.3.2 278
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBgsAFHTu7gpaalycRAkeQAJ4uq4RI2l9jfYXG6PLL9oRgKRbPCACgg/Do
+3qETqoJlOHmoJ1urZfZGCUI=
+=Uuvy
+-----END PGP SIGNATURE-----
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
deleted file mode 100644
index 7f534c0dfa34..000000000000
--- a/sys-apps/s390-tools/files/digest-s390-tools-1.2.4
+++ /dev/null
@@ -1,4 +0,0 @@
-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/digest-s390-tools-1.3.0 b/sys-apps/s390-tools/files/digest-s390-tools-1.3.0
deleted file mode 100644
index ea74077362e6..000000000000
--- a/sys-apps/s390-tools/files/digest-s390-tools-1.3.0
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0f802affd535ea3451e3f9dac79d31c9 s390-tools-1.3.0-april2004.tar.gz 807481
-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
deleted file mode 100644
index 5fd60ff52629..000000000000
--- a/sys-apps/s390-tools/files/s390-tools-1.2.4-ucdsnmp.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index 4a2b5fe6974b..000000000000
--- a/sys-apps/s390-tools/files/s390-tools-1.2.4-vtoc.diff
+++ /dev/null
@@ -1,76 +0,0 @@
---- ./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/s390-tools-1.2.4.ebuild b/sys-apps/s390-tools/s390-tools-1.2.4.ebuild
deleted file mode 100644
index 095af4a54971..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.6 2004/08/24 03:30:52 swegener Exp $
-
-inherit eutils
-
-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
-	mirror://kernel/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"
-IUSE=""
-SLOT="0"
-DEPEND="virtual/libc
-	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
-}
diff --git a/sys-apps/s390-tools/s390-tools-1.3.0.ebuild b/sys-apps/s390-tools/s390-tools-1.3.0.ebuild
deleted file mode 100644
index 5ef80a01b606..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.3.0.ebuild,v 1.6 2004/08/24 03:30:52 swegener Exp $
-
-inherit eutils
-
-STREAM="april2004"
-
-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
-	mirror://kernel/linux/kernel/v2.4/linux-${KERNEL_VERSION}.tar.bz2"
-HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/linux390/april2004_recommended.shtml"
-LICENSE="GPL-2"
-KEYWORDS="~s390"
-IUSE=""
-SLOT="0"
-DEPEND="virtual/libc
-	net-analyzer/ucd-snmp
-	app-admin/genromfs
-	dev-util/indent"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack "${PN}-${PV}-${STREAM}.tar.gz"
-	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
-}
diff --git a/sys-apps/s390-tools/s390-tools-1.3.2.ebuild b/sys-apps/s390-tools/s390-tools-1.3.2.ebuild
index c1abe1dbfa34..106573cb9294 100644
--- a/sys-apps/s390-tools/s390-tools-1.3.2.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.3.2.ebuild
@@ -1,31 +1,30 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.3.2.ebuild,v 1.1 2004/09/28 19:57:54 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.3.2.ebuild,v 1.2 2004/10/29 22:10:32 vapier Exp $
 
 inherit eutils
 
 STREAM="april2004"
-
 KERNEL="linux-2.6.5"
 BBOX="busybox-0.60.5"
 E2FS_PROGS="e2fsprogs-1.35"
 
 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
+HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/linux390/april2004_recommended.shtml"
 SRC_URI="mirror://gentoo/${PN}-${PV}-${STREAM}.tar.gz
 	http://www.busybox.net/downloads/${BBOX}.tar.bz2
 	mirror://sourceforge/e2fsprogs/${E2FS_PROGS}.tar.gz
 	mirror://kernel/linux/kernel/v2.6/${KERNEL}.tar.bz2"
-HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/linux390/april2004_recommended.shtml"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="s390"
 IUSE=""
-SLOT="0"
+
 DEPEND="virtual/libc
-	>=net-analyzer/ucd-snmp-4.2.3
+	virtual/snmp
 	app-admin/genromfs
 	dev-util/indent"
-
 PROVIDE="virtual/bootloader"
 
 src_unpack() {
@@ -42,6 +41,6 @@ src_compile() {
 }
 
 src_install() {
-	einstall INSTROOT="${D}" USRBINDIR="${D}/sbin"
+	einstall INSTROOT="${D}" USRBINDIR="${D}/sbin" || die
 	prepall
 }