Dual version bumps for bugs 90491 and 88698.

(Portage version: 2.0.51.20-r4)

6 files changed, 239 insertions, 2 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 1ca8dbdc115b..5365f3b50db8 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # 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.51 2005/04/01 13:58:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.52 2005/04/27 12:30:37 ka0ttic Exp $
+
+*rrdtool-1.2.0 (27 Apr 2005)
+*rrdtool-1.0.50 (27 Apr 2005)
+
+  27 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +rrdtool-1.0.50.ebuild,
+  +rrdtool-1.2.0.ebuild:
+  Dual version bumps for bugs 90491 and 88698.
 
   01 Apr 2005; Aron Griffis <agriffis@gentoo.org> rrdtool-1.0.49.ebuild:
   stable on ia64
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index e170d76f6240..e469647ce8c0 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,8 +1,12 @@
 MD5 437558c61fe6b02611719beff44e9f12 rrdtool-1.0.49.ebuild 2729
+MD5 9a775237825411c17d845a25434d0305 rrdtool-1.0.50.ebuild 2754
+MD5 882c9c50bf4eb57701c321cb3fa46045 rrdtool-1.2.0.ebuild 2362
 MD5 a899bdbfc828fd8d3b6eccb20639b84b rrdtool-1.0.47.ebuild 2822
-MD5 49a63e52a9124071e7df2dae78067cba ChangeLog 8284
+MD5 09cdadc96b65de04fd485714ce769356 ChangeLog 8490
 MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
 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
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.50 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.50
new file mode 100644
index 000000000000..a59b7125e075
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.50
@@ -0,0 +1 @@
+MD5 c466e2e7df95fa8e318e46437da87686 rrdtool-1.0.50.tar.gz 1474200
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.0 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.0
new file mode 100644
index 000000000000..81ca9a0871b5
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.0
@@ -0,0 +1 @@
+MD5 f945b4fa52a41fb548bba42883b69a9c rrdtool-1.2.0.tar.gz 879133
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild
new file mode 100644
index 000000000000..82ce1607c917
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild
@@ -0,0 +1,117 @@
+# 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.0.50.ebuild,v 1.1 2005/04/27 12:30:37 ka0ttic 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/rrdtool-1.0.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="perl tcltk"
+
+DEPEND="perl? ( dev-lang/perl )
+	sys-apps/gawk
+	>=media-libs/gd-1.8.3"
+RDEPEND="tcltk? ( dev-lang/tcl )"
+
+TCLVER=""
+
+pkg_setup() {
+	use perl && perl-module_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -e 's/^LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC)/& -prefer-pic/' -i src/Makefile.in
+
+	if [[ ! $(grep '^LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -prefer-pic' src/Makefile.in) ]]; then
+		die "Makefile.in sed failed"
+	fi
+}
+
+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"
+
+		# libraries without -fPIC? feh!
+		for libdir in cgilib* gd* libpng* zlib*; do
+			sed -i -e 's/^CFLAGS.*/& -fPIC/' ${libdir}/Makefile
+		done
+	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}/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
+}
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild
new file mode 100644
index 000000000000..aee44014ed50
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.2.0.ebuild
@@ -0,0 +1,107 @@
+# 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 $
+
+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=""
+
+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
+}