New upstream version. Closes bug 43997.

6 files changed, 181 insertions, 8 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index bb1dcfa8efd9..e95f83108359 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.30 2004/02/17 22:37:58 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.31 2004/03/09 05:39:51 mboman Exp $
+
+*rrdtool-1.0.46 (09 Mar 2004)
+
+  09 Mar 2004; Michael Boman <mboman@gentoo.org> rrdtool-1.0.46.ebuild,
+  files/rrdtool-1.0.46-tcl.patch:
+  New upstream version. Closes bug 43997.
 
   17 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   rrdtool-1.0.45-r2.ebuild:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 2323ad583f85..e3b05b48ad31 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,11 +1,15 @@
-MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45 67
+MD5 5a95a049a8dc6e1a1f4551c744df4266 ChangeLog 5565
+MD5 ea6990f6fcf8781ccb96cfddade41f85 rrdtool-1.0.40-r1.ebuild 2220
+MD5 6208cb65d1918638aa255492594b314c rrdtool-1.0.42-r1.ebuild 2281
+MD5 4988b6d00ac229765252cdcda097c09b rrdtool-1.0.45-r1.ebuild 2342
+MD5 72609cb5c4d5e3061ca5296427807d42 rrdtool-1.0.45-r2.ebuild 2664
+MD5 a34a3c9dd7c05f7fa28ed0521268bc5c rrdtool-1.0.45.ebuild 2325
+MD5 db2c3994a63322e5b7de3d002291108e rrdtool-1.0.46.ebuild 2766
+MD5 c0b48928d9b670b8837a080dfc28df60 metadata.xml 794
 MD5 97610425876ad7e680316d1a3e808c4b files/digest-rrdtool-1.0.40-r1 67
 MD5 e2341044ceaf46443ec4c577647d9cae files/digest-rrdtool-1.0.42-r1 67
+MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45 67
 MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r1 67
 MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r2 67
-MD5 6208cb65d1918638aa255492594b314c rrdtool-1.0.42-r1.ebuild 2281
-MD5 4988b6d00ac229765252cdcda097c09b rrdtool-1.0.45-r1.ebuild 2342
-MD5 a34a3c9dd7c05f7fa28ed0521268bc5c rrdtool-1.0.45.ebuild 2325
-MD5 ea6990f6fcf8781ccb96cfddade41f85 rrdtool-1.0.40-r1.ebuild 2220
-MD5 3c18326d1b2e8e5d0aa6d06c3c7d344d ChangeLog 5387
-MD5 72609cb5c4d5e3061ca5296427807d42 rrdtool-1.0.45-r2.ebuild 2664
+MD5 dbfa1a58afba8beb1930edc01f37f908 files/digest-rrdtool-1.0.46 67
+MD5 0375bc1ad29af2bbb7fc1782eef03896 files/rrdtool-1.0.46-tcl.patch 1170
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.46 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.46
new file mode 100644
index 000000000000..4915bd9fff2f
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.46
@@ -0,0 +1 @@
+MD5 718676770c06b25d1471cec1e4f0bbdc rrdtool-1.0.46.tar.gz 1459768
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.0.46-tcl.patch b/net-analyzer/rrdtool/files/rrdtool-1.0.46-tcl.patch
new file mode 100644
index 000000000000..ccd2c086c014
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.0.46-tcl.patch
@@ -0,0 +1,26 @@
+--- rrdtool-1.0.46.orig/tcl/Makefile.am	2003-12-01 06:01:14.000000000 +0800
++++ rrdtool-1.0.46/tcl/Makefile.am	2004-03-09 12:07:43.000000000 +0800
+@@ -22,7 +22,7 @@
+ if COMP_TCL
+ 
+ $(TCL_LIB_FILE): tclrrd.o
+-        $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
++	$(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
+ 
+ tclrrd.o: tclrrd.c
+ 	$(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\"
+--- rrdtool-1.0.46.orig/tcl/Makefile.in	2004-01-04 20:40:54.000000000 +0800
++++ rrdtool-1.0.46/tcl/Makefile.in	2004-03-09 12:42:16.000000000 +0800
+@@ -320,10 +320,10 @@
+ 
+ 
+ @COMP_TCL_TRUE@$(TCL_LIB_FILE): tclrrd.o
+-@COMP_TCL_TRUE@        $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
++@COMP_TCL_TRUE@	$(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
+ 
+ @COMP_TCL_TRUE@tclrrd.o: tclrrd.c
+-@COMP_TCL_TRUE@	$(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\"
++@COMP_TCL_TRUE@	$(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -I$(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"
+ 
+ @COMP_TCL_TRUE@all-local: $(TCL_LIB_FILE)
+ 
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
new file mode 100644
index 000000000000..0c0bf794ff1f
--- /dev/null
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>mboman@gentoo.org</email>
+		<description>Interim Maintainer</description>
+	</maintainer>
+<longdescription>RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average). It stores the data in a very compact way that will not expand over time, and it presents useful graphs by processing the data to enforce a certain data density. It can be used either via simple wrapper scripts (from shell or Perl) or via frontends that poll network devices and put a friendly user interface on it.</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild
new file mode 100644
index 000000000000..30fa21b97f6b
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.46.ebuild,v 1.1 2004/03/09 05:39:51 mboman Exp $
+
+inherit perl-module flag-o-matic gnuconfig
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
+SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~hppa"
+IUSE="tcltk perl"
+
+DEPEND="perl? ( dev-lang/perl )
+	sys-apps/gawk
+	>=media-libs/libgd-1.8.3"
+RDEPEND="tcltk? ( dev-lang/tcl )"
+TCLVER=""
+
+pkg_setup() {
+	if use tcltk ; then
+		TCLVER=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh`
+	fi
+
+	if use perl ; then
+		perl-module_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-tcl.patch # 1.0.46 has a broke TCL Makefile
+}
+
+src_compile() {
+	filter-mfpmath sse
+	filter-flags -ffast-math
+
+	local myconf
+	use tcltk \
+		&& myconf="${myconf} --with-tcllib=/usr/lib" \
+		|| myconf="${myconf} --without-tcllib"
+
+	use amd64 && gnuconfig_update
+
+	if [ `use perl` ] ; then
+	MMSIXELEVEN=`perl -e 'use ExtUtils::MakeMaker; print( $ExtUtils::MakeMaker::VERSION ge "6.11" )'`
+	  if [ "${MMSIXELEVEN}" ]; then
+	   econf \
+		--datadir=/usr/share \
+		--enable-shared \
+		--with-perl-options='INSTALLDIRS=vendor destdir=${D}/' \
+		${myconf} || die
+
+	  else
+	   econf \
+		--datadir=/usr/share \
+		--enable-shared \
+		--with-perl-options='PREFIX=${D}/usr INSTALLDIRS=vendor' \
+		${myconf} || die
+	  fi
+	else
+	 econf \
+	  --datadir=/usr/share \
+	  --enable-shared \
+	  ${myconf} || die
+	fi
+
+	make || die
+}
+
+src_install() {
+	einstall || die
+
+	# this package completely ignores mandir settings
+
+	doman doc/*.1
+	dohtml doc/*.html
+	dodoc doc/*.pod
+	dodoc doc/*.txt
+
+	rm -rf ${D}/usr/doc
+	rm -rf ${D}/usr/html
+	rm -rf ${D}/usr/man
+	rm -rf ${D}/usr/contrib
+	rm -rf ${D}/usr/examples
+
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*
+
+	if [ `use perl` ] ; then
+		perlinfo
+		mytargets="site-perl-install"
+		perl-module_src_install || die
+	fi
+
+	if [ `use tcltk` ] ; then
+		mv ${S}/tcl/tclrrd.so ${S}/tcl/tclrrd${PV}.so
+		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
+		doins ${S}/tcl/tclrrd${PV}.so
+		echo "package ifneeded Rrd ${PV} [list load [file join \$$dir .. tclrrd${PV}.so]]" \
+			>> ${D}/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
+	fi
+
+	dodoc COPY* CONTR* README TODO
+}
+
+pkg_preinst() {
+	use perl && perl-module_pkg_preinst
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+}
+
+pkg_prerm() {
+	use perl && perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+}