11 files changed, 53 insertions, 16 deletions
diff --git a/net-analyzer/calamaris/ChangeLog b/net-analyzer/calamaris/ChangeLog
index 13e6d1670f8c..e12128648abd 100644
--- a/net-analyzer/calamaris/ChangeLog
+++ b/net-analyzer/calamaris/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/calamaris
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/ChangeLog,v 1.5 2004/06/24 21:58:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/ChangeLog,v 1.6 2004/07/08 23:17:11 eldad Exp $
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  calamaris-2.51.ebuild, calamaris-2.57.ebuild:
+  Added metadata
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> calamaris-2.51.ebuild,
+  calamaris-2.57.ebuild:
+  Tidy up, added missing IUSE
 
 *calamaris-2.57 (09 Mar 2003)
 
diff --git a/net-analyzer/calamaris/calamaris-2.51.ebuild b/net-analyzer/calamaris/calamaris-2.51.ebuild
index b82563b04629..0b2c74e9abcd 100644
--- a/net-analyzer/calamaris/calamaris-2.51.ebuild
+++ b/net-analyzer/calamaris/calamaris-2.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/calamaris-2.51.ebuild,v 1.4 2004/06/24 21:58:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/calamaris-2.51.ebuild,v 1.5 2004/07/08 23:17:11 eldad Exp $
 
 DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports"
 HOMEPAGE="http://calamaris.cord.de/"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="ppc x86"
 DEPEND="dev-lang/perl"
 RDEPEND="dev-lang/perl"
-S=${WORKDIR}/${P}
+IUSE=""
 
 src_install () {
 	dobin calamaris
diff --git a/net-analyzer/calamaris/calamaris-2.57.ebuild b/net-analyzer/calamaris/calamaris-2.57.ebuild
index a02cab1ed84e..dc6e865ef60d 100644
--- a/net-analyzer/calamaris/calamaris-2.57.ebuild
+++ b/net-analyzer/calamaris/calamaris-2.57.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/calamaris-2.57.ebuild,v 1.4 2004/06/24 21:58:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/calamaris-2.57.ebuild,v 1.5 2004/07/08 23:17:11 eldad Exp $
 
 DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports"
 HOMEPAGE="http://calamaris.cord.de/"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 DEPEND="dev-lang/perl"
 RDEPEND="dev-lang/perl"
-S=${WORKDIR}/${P}
+IUSE=""
 
 src_install () {
 	dobin calamaris
diff --git a/net-analyzer/calamaris/metadata.xml b/net-analyzer/calamaris/metadata.xml
new file mode 100644
index 000000000000..e0a1efa4d101
--- /dev/null
+++ b/net-analyzer/calamaris/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-imagepack/ChangeLog b/net-analyzer/nagios-imagepack/ChangeLog
index 212457862f8d..2ba5edec5a46 100644
--- a/net-analyzer/nagios-imagepack/ChangeLog
+++ b/net-analyzer/nagios-imagepack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-imagepack
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/ChangeLog,v 1.4 2004/06/24 22:08:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/ChangeLog,v 1.5 2004/07/08 23:20:31 eldad Exp $
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-imagepack-1.0.ebuild:
+  Added metadata
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-imagepack-1.0.ebuild:
+  Tidy up.
 
   15 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-imagepack-1.0 :
   Changed ~x86 to x86 and added sparc and ppc keywords
diff --git a/net-analyzer/nagios-imagepack/metadata.xml b/net-analyzer/nagios-imagepack/metadata.xml
new file mode 100644
index 000000000000..093ac2160bed
--- /dev/null
+++ b/net-analyzer/nagios-imagepack/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>Nagios imagepacks - Icons and pictures for Nagios</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild b/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild
index f6b9f0db7b2e..60922737bba7 100644
--- a/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild
+++ b/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild,v 1.6 2004/06/24 22:08:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild,v 1.7 2004/07/08 23:20:31 eldad Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Nagios imagepacks - Icons and pictures for Nagios"
 HOMEPAGE="http://www.nagios.org"
 IMAGE_URI="mirror://sourceforge/nagios/"
@@ -23,6 +22,8 @@ KEYWORDS="x86 ~sparc ~ppc ~amd64"
 
 RDEPEND="net-analyzer/nagios-core"
 
+IUSE=""
+
 src_unpack() {
 	local bn
 	mkdir ${S}
diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 526834cd7810..5b6e4dc3dc72 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.19 2004/06/24 22:09:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.20 2004/07/08 23:24:36 eldad Exp $
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nagios-plugins-1.3.1-r1.ebuild, nagios-plugins-1.3.1.ebuild:
+  Added metadata
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-plugins-1.3.1-r1.ebuild,
+  nagios-plugins-1.3.1.ebuild:
+  Tidy up, fixed use flag typo
 
 *nagios-plugins-1.3.1-r1 (12 Feb 2004)
 
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
new file mode 100644
index 000000000000..895581eaff5c
--- /dev/null
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>Nagios plugins - Pack of plugins to make Nagios work properly</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
index 131d0b41ba7f..e6f81499dcb0 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild,v 1.2 2004/06/24 22:09:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild,v 1.3 2004/07/08 23:24:36 eldad Exp $
 
 inherit eutils
 
@@ -29,8 +29,6 @@ RDEPEND=">=dev-lang/perl-5.6.1-r7
 	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
 	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )"
 
-S="${WORKDIR}/${P}"
-
 pkg_setup() {
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /dev/null nagios
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild
index 11ba54e094e9..3e10b1e2579b 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild,v 1.4 2004/06/24 22:09:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.3.1.ebuild,v 1.5 2004/07/08 23:24:36 eldad Exp $
 
 inherit eutils
 
@@ -26,8 +26,6 @@ DEPEND=">=net-dns/bind-tools-9.2.2_rc1
 		postgres? ( >=dev-db/postgresql-7.2 )
 		ldap? ( >=net-nds/openldap-2.0.25 )"
 
-S="${WORKDIR}/${P}"
-
 pkg_setup() {
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /dev/null nagios
@@ -37,7 +35,7 @@ src_compile() {
 	local myconf
 	use mysql && myconf="${myconf} --with-mysql"
 	use postgres && myconf="${myconf} --with-pgsql"
-	use openssl && myconf="${myconf} --with-openssl"
+	use ssl && myconf="${myconf} --with-openssl"
 
 	./configure ${myconf} \
 		--host=${CHOST} \