4 files changed, 119 insertions, 1 deletions
diff --git a/sys-apps/discover/Manifest b/sys-apps/discover/Manifest
index 2f85f0b67099..8b7c4cf2fd3e 100644
--- a/sys-apps/discover/Manifest
+++ b/sys-apps/discover/Manifest
@@ -1,6 +1,7 @@
-MD5 a74c8f24d0b92630d0f60d1888fb2cc0 discover-2.0.1.ebuild 784
+MD5 f9d9c0f0953e686d1851fe8abc044337 discover-2.0.1.ebuild 950
 MD5 433e849a15029de96a083ae7bab38bc8 discover-1.5-r1.ebuild 1064
 MD5 d22bb001ca877eb778cd787b30eea8e7 ChangeLog 1321
 MD5 4d59e3fc91e229d85cac21878f0c32c5 files/digest-discover-2.0.1 67
 MD5 a43ca5971902215ada3f6fd11f9e61b1 files/etc-init.d-discover 4860
 MD5 42bb9651b70640a9fc78dc24b91ae19a files/digest-discover-1.5-r1 66
+MD5 8c2cc7e9b0a2e7b0baa93b9288d541a4 files/discover-2.0.1-gcc-3.3.patch 4110
diff --git a/sys-apps/discover/discover-2.0.1.ebuild b/sys-apps/discover/discover-2.0.1.ebuild
new file mode 100644
index 000000000000..2ee32c86c8d2
--- /dev/null
+++ b/sys-apps/discover/discover-2.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover/discover-2.0.1.ebuild,v 1.1 2003/09/18 17:24:59 seemant Exp $
+
+IUSE="pcmcia"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Library and front-end for retrieving information about a system's hardware."
+HOMEPAGE="http://hackers.progeny.com/${PN}/"
+SRC_URI="http://archive.progeny.com/progeny/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+
+DEPEND="virtual/linux-sources
+	net-ftp/curl
+	dev-libs/expat"
+
+PDEPEND="sys-apps/discover-data"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gcc-3.3.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	use pcmcia \
+		&& myconf="${myconf} --with-pcmcia-headers=/usr/src/linux/include"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS INSTALL LICENSE README RELEASE
+}
diff --git a/sys-apps/discover/files/digest-discover-2.0.1 b/sys-apps/discover/files/digest-discover-2.0.1
new file mode 100644
index 000000000000..01a62e719076
--- /dev/null
+++ b/sys-apps/discover/files/digest-discover-2.0.1
@@ -0,0 +1 @@
+MD5 0b01a00b0ff6534e99b15b0e61501281 discover-2.0.1.tar.bz2 388714
diff --git a/sys-apps/discover/files/discover-2.0.1-gcc-3.3.patch b/sys-apps/discover/files/discover-2.0.1-gcc-3.3.patch
new file mode 100644
index 000000000000..014808554d8d
--- /dev/null
+++ b/sys-apps/discover/files/discover-2.0.1-gcc-3.3.patch
@@ -0,0 +1,75 @@
+diff -urN discover-2.0.1/discover/discover.c discover-2.0.1-new/discover/discover.c
+--- discover-2.0.1/discover/discover.c	2002-10-11 11:07:26.000000000 -0700
++++ discover-2.0.1-new/discover/discover.c	2003-09-16 03:43:08.000000000 -0700
+@@ -247,38 +247,14 @@
+ static void
+ print_usage(void)
+ {
+-    puts("\
+-usage: discover [--bus-summary] [OPTIONS] [BUS [...]]
+-       discover --type-summary [OPTIONS] [TYPE [...]]
+-       discover --data-path=PATH [--data-version=VERSION] TYPE [...]
+-       discover --version
+-       discover --help");
++    puts("\nusage: discover [--bus-summary] [OPTIONS] [BUS [...]] \ndiscover --type-summary [OPTIONS] [TYPE [...]] \ndiscover --data-path=PATH [--data-version=VERSION] TYPE [...] \ndiscover --version \ndiscover --help");
+ }
+ 
+ static void
+ print_help(void)
+ {
+     print_usage();
+-    puts("
+-  -b, --bus-summary          Summarize by bus.
+-  -t, --type-summary         Summarize by device type.
+-  --data-path PATH           Print the data matching PATH.
+-
+-OPTIONS
+-  -d, --disable-bus BUS      Disable the bus BUS.
+-  -e, --enable-bus BUS       Enable the bus BUS.
+-  --data-version VERSION     Print only data matching VERSION.
+-  --insert-url URL           Insert URL in front of the list of data sources.
+-  --append-url URL           Append URL at the end of the list of data sources.
+-  --[no-]vendor              Do [not] print the vendor name.
+-  --[no-]vendor-id           Do [not] print the bus-specific vendor ID.
+-  --[no-]model               Do [not] print the model name.
+-  --[no-]model-id            Do [not] print the bus-specific model ID.
+-  --normalize-whitespace     Condense all white space into individual spaces
+-                             and eliminate leading and trailing white space.
+-  --format TEMPLATE          Format the query data output.
+-  -v, --verbose              Print verbose output.
+-");
++    puts("\n-b, --bus-summary          Summarize by bus.\n-t, --type-summary         Summarize by device type.\n--data-path PATH           Print the data matching PATH.\n\nOPTIONS\n-d, --disable-bus BUS      Disable the bus BUS.\n-e, --enable-bus BUS       Enable the bus BUS.\n--data-version VERSION     Print only data matching VERSION.\n--insert-url URL           Insert URL in front of the list of datasources.\n--append-url URL           Append URL at the end of the list of datasources.\n--[no-]vendor              Do [not] print the vendor name.\n--[no-]vendor-id           Do [not] print the bus-specific vendor ID.\n--[no-]model               Do [not] print the model name.\n--[no-]model-id            Do [not] print the bus-specific model ID.\n--normalize-whitespace     Condense all white space into individual spaces\nand eliminate leading and trailing white\nspace.\n--format TEMPLATE          Format the query data output.\n-v, --verbose              Print verbose output.\n");
+     printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
+ }
+ 
+diff -urN discover-2.0.1/discover-xml/discover-xml.c discover-2.0.1-new/discover-xml/discover-xml.c
+--- discover-2.0.1/discover-xml/discover-xml.c	2002-10-16 14:35:15.000000000 -0700
++++ discover-2.0.1-new/discover-xml/discover-xml.c	2003-09-16 03:44:10.000000000 -0700
+@@ -77,25 +77,14 @@
+ static void
+ print_usage()
+ {
+-    puts("
+-usage: discover-xml [OPTIONS]
+-       discover-xml --type-summary [OPTIONS]
+-       discover-xml --version
+-       discover-xml --help");
++    puts("\nusage: discover-xml [OPTIONS]\ndiscover-xml --type-summary [OPTIONS]\ndiscover-xml --version\ndiscover-xml --help");
+ }
+ 
+ static void
+ print_help()
+ {
+     print_usage();
+-    puts("
+-  -t, --type-summary        Summarize by device type.
+-
+-OPTIONS
+-  -d, --disable-bus BUS     Disable the bus BUS.
+-  -e, --enable-bus BUS      Enable the bus BUS.
+-  -v, --verbose             Print verbose output.
+-");
++    puts("\n-t, --type-summary        Summarize by device type.\n\nOPTIONS\n-d, --disable-bus BUS     Disable the bus BUS.\n-e, --enable-bus BUS      Enable the bus BUS.\n-v, --verbose             Print verbose output.\n");
+     printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
+ }
+