Added patch as requested by bug #36410

6 files changed, 57 insertions, 8 deletions

diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 783abf699247..a65d3119182e 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,7 +1,8 @@
-MD5 fbe2887d58d170d93bdc0977799e1718 ChangeLog 553
-MD5 abd5ce33e8bc1447d9c8beac98b22196 sarg-1.2.2.ebuild 826
-MD5 128236122f3c77519a76ab0860d70b9e sarg-1.4.1.ebuild 900
-MD5 9d58834c6495198f57ba87d7f9c8de2f sarg-1.4.1-r1.ebuild 1062
+MD5 2c3158204cfb4b9c36b8bc78e8421b16 metadata.xml 223
+MD5 4b9de94fad7ed66b8c0092fe8587c998 ChangeLog 730
+MD5 35872fcbf62a5813c14263110dfbb524 sarg-1.2.2.ebuild 826
+MD5 d28f2ca4b67a859a48ff1864bcbaef3b sarg-1.4.1.ebuild 903
+MD5 15f352f86cbd1cb23cd811118b1b3dc9 sarg-1.4.1-r1.ebuild 955
 MD5 c1d5675a58b98064b57ce771a2ecd4b8 files/digest-sarg-1.4.1-r1 132
 MD5 b60741cb2874bce6ba11ed9ab30de7ac files/digest-sarg-1.2.2 62
 MD5 d0d0e64d8851d613b34982597a1d1cee files/digest-sarg-1.4.1 62
diff --git a/net-analyzer/sarg/files/digest-sarg-1.4.1-r1 b/net-analyzer/sarg/files/digest-sarg-1.4.1-r1
new file mode 100644
index 000000000000..0b8bfd6626de
--- /dev/null
+++ b/net-analyzer/sarg/files/digest-sarg-1.4.1-r1
@@ -0,0 +1,2 @@
+MD5 357f8e175746e19dac4a61f4a2ef0aaf sarg-1.4.1.tar.gz 125589
+MD5 4ffb8c39d2fc4261390b3d58c39e588a sarg-1.4.1-index.sort.patch 2034
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
new file mode 100644
index 000000000000..c5d67a611520
--- /dev/null
+++ b/net-analyzer/sarg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>jhhudso@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/sarg/sarg-1.2.2.ebuild b/net-analyzer/sarg/sarg-1.2.2.ebuild
index babcb9c3ae8b..fd6748562042 100644
--- a/net-analyzer/sarg/sarg-1.2.2.ebuild
+++ b/net-analyzer/sarg/sarg-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-1.2.2.ebuild,v 1.5 2003/05/24 09:27:08 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-1.2.2.ebuild,v 1.6 2004/01/04 06:35:23 jhhudso Exp $
 
 DESCRIPTION="Sarg (Squid Analysis Report Generator) is a tool that allows you to view where your users are going to on the Internet."
 HOMEPAGE="http://web.onda.com.br/orso/sarg.html"
diff --git a/net-analyzer/sarg/sarg-1.4.1-r1.ebuild b/net-analyzer/sarg/sarg-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..51524d0f0ed7
--- /dev/null
+++ b/net-analyzer/sarg/sarg-1.4.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
+
+DESCRIPTION="Sarg (Squid Analysis Report Generator) is a tool that allows you to view where your users are going to on the Internet."
+HOMEPAGE="http://web.onda.com.br/orso/sarg.html"
+SRC_URI="http://web.onda.com.br/orso/${P}.tar.gz http://web.onda.com.br/orso/patches/sarg-1.4.1-index.sort.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND=""
+RDEPEND=">=net-www/squid-2.5.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${DISTDIR}/sarg-1.4.1-index.sort.patch
+}
+
+src_compile() {
+	rm -rf config.cache
+	./configure \
+		--enable-bindir=/usr/bin \
+		--enable-mandir=/usr/man/man1 \
+		--enable-sysconfdir=/etc/sarg || die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	dodir /etc/sarg /usr/bin /usr/man/man1
+	make \
+		BINDIR=${D}/usr/bin \
+		MANDIR=${D}/usr/man/man1 \
+		SYSCONFDIR=${D}/etc/sarg \
+		install || die
+}
diff --git a/net-analyzer/sarg/sarg-1.4.1.ebuild b/net-analyzer/sarg/sarg-1.4.1.ebuild
index 04649624fc32..2c38afcd995f 100644
--- a/net-analyzer/sarg/sarg-1.4.1.ebuild
+++ b/net-analyzer/sarg/sarg-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-1.4.1.ebuild,v 1.3 2003/07/13 11:30:14 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-1.4.1.ebuild,v 1.4 2004/01/04 06:35:23 jhhudso Exp $
 
 DESCRIPTION="Sarg (Squid Analysis Report Generator) is a tool that allows you to view where your users are going to on the Internet."
 HOMEPAGE="http://web.onda.com.br/orso/sarg.html"