bug 91287

Package-Manager: portage-2.0.51.19

5 files changed, 140 insertions, 14 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 5365f3b50db8..494bc1a1f0ce 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.52 2005/04/27 12:30:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.53 2005/05/03 23:04:43 vanquirius Exp $
+
+*rrdtool-1.2.1 (03 May 2005)
+
+  03 May 2005; Marcelo Goes <vanquirius@gentoo.org> rrdtool-1.2.0.ebuild,
+  +rrdtool-1.2.1.ebuild:
+  Version bump, fix compilation problem with 1.2.0. Fixes bug 91287. Thanks to
+  Andy Blyler <ajb@blyler.cc>, Marco Morales <soulse@gmail.com> and Frederic
+  Mangeant <frederic.mangeant@gmail.com>.
 
 *rrdtool-1.2.0 (27 Apr 2005)
 *rrdtool-1.0.50 (27 Apr 2005)
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 5203a5f79ba8..a3cb494ec9bc 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 437558c61fe6b02611719beff44e9f12 rrdtool-1.0.49.ebuild 2729
 MD5 177f6939c1ba72adbbd42b99ea93121f rrdtool-1.0.50.ebuild 2753
-MD5 f75f280c4dff3ac82b2556a53144cf7c rrdtool-1.2.0.ebuild 2466
+MD5 95a9996ac7b6de4a5d3600a6c0ff59aa rrdtool-1.2.0.ebuild 2683
 MD5 a899bdbfc828fd8d3b6eccb20639b84b rrdtool-1.0.47.ebuild 2822
-MD5 c90633652f71dbf0c53b259e6c097c91 ChangeLog 8489
+MD5 5181a55310ab41254f98c1455fbfeb49 ChangeLog 8820
 MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
+MD5 709f2ace12d8ee2c050844b26c6f6132 rrdtool-1.2.1.ebuild 2683
 MD5 fd937eb5e7f8eab72f05e74d1533ddab rrdtool-1.0.45-r2.ebuild 2624
 MD5 cd1090ecb4ba89539e79667d88e4431c files/digest-rrdtool-1.0.47 67
 MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67
 MD5 0f97ed6174056bc1f72fbd7eb964f3f6 files/digest-rrdtool-1.0.50 67
 MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r2 67
 MD5 9ff5b12796af907241cf16914fc39f17 files/digest-rrdtool-1.2.0 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD4DBQFCb4YwEZCkKN40op4RAhZnAJUfhJTP0cRDX+kMXbqxn33f6egwAJ9FDEGa
-srFs2B000X63g4WdRe19/A==
-=85DO
------END PGP SIGNATURE-----
+MD5 349f96485884bed355784001801db15e files/digest-rrdtool-1.2.1 65
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.1 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.1
new file mode 100644
index 000000000000..574ee8c4b05c
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.1
@@ -0,0 +1 @@
+MD5 10b2f600162b0c8c1bf2883ac1a0b84d rrdtool-1.2.1.tar.gz 890138
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild
index aee44014ed50..1bf982dea71f 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild,v 1.1 2005/04/27 12:30:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild,v 1.2 2005/05/03 23:04:43 vanquirius Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -25,6 +25,15 @@ RDEPEND="tcltk? ( dev-lang/tcl )"
 
 TCLVER=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's:<rrd_\(.*\)>:"../../src/rrd_\1":g' \
+		bindings/tcl/tclrrd.c || die "sed failed"
+	sed -i -e 's:-lrrd_private::' \
+		bindings/tcl/Makefile.* || die "sed failed"
+}
+
 pkg_setup() {
 	use perl && perl-module_pkg_setup
 }
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.1.ebuild
new file mode 100644
index 000000000000..bdb1a5c2b3c1
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.2.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.1.ebuild,v 1.1 2005/05/03 23:04:43 vanquirius 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/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc"
+IUSE="perl tcltk"
+
+DEPEND="perl? ( dev-lang/perl )
+	sys-apps/gawk
+	>=sys-libs/zlib-1.2.1
+	>=media-libs/freetype-2.1.5
+	>=media-libs/libart_lgpl-2.3.16
+	>=media-libs/libpng-1.2.5
+	>=media-libs/gd-1.8.3
+	>=dev-libs/cgilib-0.5"
+RDEPEND="tcltk? ( dev-lang/tcl )"
+
+TCLVER=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's:<rrd_\(.*\)>:"../../src/rrd_\1":g' \
+		bindings/tcl/tclrrd.c || die "sed failed"
+	sed -i -e 's:-lrrd_private::' \
+		bindings/tcl/Makefile.* || die "sed failed"
+}
+
+pkg_setup() {
+	use perl && perl-module_pkg_setup
+}
+
+src_compile() {
+	filter-mfpmath sse
+	filter-flags -ffast-math
+
+	local myconf
+	myconf="${myconf} --datadir=/usr/share --enable-shared"
+
+	use tcltk \
+		&& myconf="${myconf} --with-tcllib=/usr/lib" \
+		|| myconf="${myconf} --without-tcllib"
+
+	if use perl; then
+		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed"
+	else
+		econf ${myconf} || die "econf failed"
+	fi
+
+	make || die "make failed"
+}
+
+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
+
+		# remove duplicate installation into /usr/lib/perl
+		rm -Rf ${D}/usr/lib/perl
+	fi
+
+	if use tcltk ; then
+		mv ${S}/bindings/tcl/tclrrd.so ${S}/bindings/tcl/tclrrd${PV}.so
+		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
+		doins ${S}/bindings/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
+}