Fixed things up while talking with seemant.

4 files changed, 22 insertions, 79 deletions

diff --git a/sys-apps/discover/ChangeLog b/sys-apps/discover/ChangeLog
index f4105eec1a31..1d8c66333d89 100644
--- a/sys-apps/discover/ChangeLog
+++ b/sys-apps/discover/ChangeLog
@@ -1,10 +1,25 @@
+# ChangeLog for sys-apps/discover
+# Copyright 2002 TelemetryBox Corporation; Distributed under GPL-2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover/ChangeLog,v 1.3 2002/07/31 16:00:19 christoph Exp $
 
-discover-1.5-r1.ebuild July 30, 2002 christoph@gentoo.org
+*discover-1.5 (June 2002)
+  June 2002; Name <christoph@lameter.com> discover-1.5.ebuild files/digest-discover-1.5
+
+  Discover is a hardware identification system based on the libdiscover1
+  library.  Discover provides a flexible interface that programs can use to
+  report a wide range of information about the hardware that is installed on a
+  Linux system.  In addition to reporting information, discover includes
+  support for doing hardware detection at boot time.  Detection occurs in two
+  stages: The first stage, which runs from an initial ramdisk (initrd), loads
+  just the drivers needed to mount the root file system, and the second stage
+  loads the rest (ethernet cards, sound cards, etc.).
+ 
+*discover-1.5-r1 (30 July 2002)
+  30 July 2002; Name <christoph@gentoo.org> discover-1.5-r1.ebuild files/digest-discover-1.5-r1
 
   First release into gentoo cvs tree
 
-discover-1.5-r2.ebuild July 31, 2002 christoph@gentoo.org
+  31 July 2002; Name <christoph@gentoo.org>
 
   Fix ebuild RDEPEND and other things
-
  
\ No newline at end of file
diff --git a/sys-apps/discover/discover-1.5-r1.ebuild b/sys-apps/discover/discover-1.5-r1.ebuild
index 6ae540c86443..e8db512640fe 100644
--- a/sys-apps/discover/discover-1.5-r1.ebuild
+++ b/sys-apps/discover/discover-1.5-r1.ebuild
@@ -4,32 +4,14 @@
 #
 # Released under the GPL
 #
-# -r1 provide gentoo discover script. Create missing /var/lib/discover
-#     directory
 DESCRIPTION="Discover hardware and load the appropriate drivers for that hardware."
-
-LONGDESC="
- Discover is a hardware identification system based on the libdiscover1
- library.  Discover provides a flexible interface that programs can use to
- report a wide range of information about the hardware that is installed on a
- Linux system.  In addition to reporting information, discover includes
- support for doing hardware detection at boot time.  Detection occurs in two
- stages: The first stage, which runs from an initial ramdisk (initrd), loads
- just the drivers needed to mount the root file system, and the second stage
- loads the rest (ethernet cards, sound cards, etc.)."
- 
 HOMEPAGE="http://www.progeny.com/discover"
-
 SRC_URI="ftp://ftp.debian.org/debian/pool/main/d/discover/discover_1.5-1.tar.gz"
-
-LICENSE="GPL"
-SLOT="1"
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc"
-
-DEPEND="bash"
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-RDEPEND="home/discover-data"
+DEPEND=""
+RDEPEND="sys-apps/discover-data"
 
 S=${WORKDIR}/${P}
 
diff --git a/sys-apps/discover/discover-1.5-r2.ebuild b/sys-apps/discover/discover-1.5-r2.ebuild
deleted file mode 100644
index 682d0bc4a455..000000000000
--- a/sys-apps/discover/discover-1.5-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# (C) 2002 The TelemetryBox Corporation. http://telemetrybox.biz
-# Christoph Lameter, <christoph@lameter.com>, July 15, 2002
-#
-# Released under the GPL
-#
-# -r1 provide gentoo discover script. Create missing /var/lib/discover
-#     directory
-DESCRIPTION="Discover hardware and load the appropriate drivers for that hardware."
-
-LONGDESC="
- Discover is a hardware identification system based on the libdiscover1
- library.  Discover provides a flexible interface that programs can use to
- report a wide range of information about the hardware that is installed on a
- Linux system.  In addition to reporting information, discover includes
- support for doing hardware detection at boot time.  Detection occurs in two
- stages: The first stage, which runs from an initial ramdisk (initrd), loads
- just the drivers needed to mount the root file system, and the second stage
- loads the rest (ethernet cards, sound cards, etc.)."
- 
-HOMEPAGE="http://www.progeny.com/discover"
-
-SRC_URI="ftp://ftp.debian.org/debian/pool/main/d/discover/discover_1.5-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86 ppc"
-
-DEPEND=""
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-RDEPEND="sys-apps/discover-data"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	./configure --prefix=/usr \
-                --sbindir=/sbin \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info || die "configure failed"
-  emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-        cp ${FILESDIR}/etc-init.d-discover ${D}/etc/init.d/discover
-        insinto /usr/share/discover
-        doins discover/linuxrc
-	dodoc BUGS AUTHORS ChangeLog NEWS README TODO ChangeLog.mandrake docs/ISA-Structure docs/PCI-Structure docs/Programming
-	insinto /var/lib/discover
-	prepallman
-}
diff --git a/sys-apps/discover/files/digest-discover-1.5-r2 b/sys-apps/discover/files/digest-discover-1.5-r2
deleted file mode 100644
index ef9f5f0ac315..000000000000
--- a/sys-apps/discover/files/digest-discover-1.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0dd025df0f3c7f2c05e4f6f7596e636b discover_1.5-1.tar.gz 382861