Version bumped.

5 files changed, 154 insertions, 9 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 5afc2b4c5b90..dd93def69b64 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.32 2004/03/18 15:23:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.33 2004/04/07 17:08:16 mholzer Exp $
+
+*rrdtool-1.0.47 (07 Apr 2004)
+
+  07 Apr 2004; Martin Holzer <mholzer@gentoo.org> rrdtool-1.0.47.ebuild,
+  files/rrdtool-1.0.47-fPIC.patch:
+  Version bumped.
 
   18 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> rrdtool-1.0.46.ebuild,
   files/rrdtool-1.0.46-fPIC.patch:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 8248ee4be62c..b419fc818df5 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,16 +1,18 @@
-MD5 6208cb65d1918638aa255492594b314c rrdtool-1.0.42-r1.ebuild 2281
-MD5 30a02d5d4042e64819c035fd6a5608ea rrdtool-1.0.46.ebuild 2785
-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 a7e2862f7fd49e37428521eb80dc7258 ChangeLog 5718
 MD5 c0b48928d9b670b8837a080dfc28df60 metadata.xml 794
+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 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45 67
-MD5 dbfa1a58afba8beb1930edc01f37f908 files/digest-rrdtool-1.0.46 67
+MD5 a34a3c9dd7c05f7fa28ed0521268bc5c rrdtool-1.0.45.ebuild 2325
+MD5 30a02d5d4042e64819c035fd6a5608ea rrdtool-1.0.46.ebuild 2785
+MD5 30a02d5d4042e64819c035fd6a5608ea rrdtool-1.0.47.ebuild 2785
 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 0375bc1ad29af2bbb7fc1782eef03896 files/rrdtool-1.0.46-tcl.patch 1170
+MD5 dbfa1a58afba8beb1930edc01f37f908 files/digest-rrdtool-1.0.46 67
 MD5 db9507e851ba51a61398c1ac7816f72a files/rrdtool-1.0.46-fPIC.patch 587
+MD5 0375bc1ad29af2bbb7fc1782eef03896 files/rrdtool-1.0.46-tcl.patch 1170
+MD5 cd1090ecb4ba89539e79667d88e4431c files/digest-rrdtool-1.0.47 67
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.47 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.47
new file mode 100644
index 000000000000..2dceff9395a2
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.47
@@ -0,0 +1 @@
+MD5 19fec533ad125b2538f5e27b3be6dfd6 rrdtool-1.0.47.tar.gz 1462489
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.0.47-fPIC.patch b/net-analyzer/rrdtool/files/rrdtool-1.0.47-fPIC.patch
new file mode 100644
index 000000000000..2e740dbdaf07
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.0.47-fPIC.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in	2004-03-18 14:32:51.670818448 +0000
++++ src/Makefile.in	2004-03-18 14:33:05.911258477 +0000
+@@ -336,7 +336,7 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/rrd_xport.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -prefer-pic $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
new file mode 100644
index 000000000000..1ebecb30e531
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
@@ -0,0 +1,125 @@
+# 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.47.ebuild,v 1.1 2004/04/07 17:08:16 mholzer Exp $
+
+inherit perl-module flag-o-matic gnuconfig eutils
+
+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}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fPIC.patch
+}
+
+src_compile() {
+	filter-mfpmath sse
+	filter-flags -ffast-math
+
+	local myconf
+	use tcltk \
+		&& myconf="${myconf} --with-tcllib=/usr/lib" \
+		|| myconf="${myconf} --without-tcllib"
+
+	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
+}