Made changes as per bug 104956 for multilib

(Portage version: 2.0.51.22-r2)

4 files changed, 134 insertions, 2 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 2db032cdb82b..5805c8d7ad9f 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,12 @@
 # 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.80 2005/08/25 13:01:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.81 2005/09/06 12:28:17 strerror Exp $
+
+*rrdtool-1.2.11-r1 (06 Sep 2005)
+
+  06 Sep 2005; Benjamin Smee <strerror@gentoo.org>
+  +rrdtool-1.2.11-r1.ebuild:
+  Made changes as per bug 104956 for multilib
 
   24 Aug 2005; Aron Griffis <agriffis@gentoo.org> rrdtool-1.2.6-r1.ebuild:
   stable on ia64 #93063
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 00ecf151a24d..7e7407527e42 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,8 +1,9 @@
 MD5 7245abe6326ff3cc840e5092c1b60890 rrdtool-1.0.49.ebuild 2729
 MD5 177f6939c1ba72adbbd42b99ea93121f rrdtool-1.0.50.ebuild 2753
 MD5 fef8045c2bacc8cea9464b5814d2c1b3 rrdtool-1.2.10.ebuild 2736
+MD5 de08f61391b38c4c7f1b5cfd67885ce6 rrdtool-1.2.11-r1.ebuild 3005
 MD5 5237327ba17008615f4ee3498d1e12aa rrdtool-1.2.9.ebuild 2734
-MD5 16644d0888812ab120711c9e5e5937cd ChangeLog 12349
+MD5 8a008f301f4021caeb841e8f3e190507 ChangeLog 12510
 MD5 19c7cf9496d4c88a2f2badad0034669f rrdtool-1.2.6-r1.ebuild 2757
 MD5 108d7118044d58ce07544af00277028b rrdtool-1.2.6.ebuild 2815
 MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
@@ -13,4 +14,5 @@ MD5 f16d0d8d5db1ed4ece7a3221c9fb8266 files/digest-rrdtool-1.2.10 67
 MD5 1b866549cddb9e5a73a64be509395166 files/digest-rrdtool-1.2.11 67
 MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6 65
 MD5 ddcbf31c065a424ce3ad6595d1b5ea8d files/digest-rrdtool-1.2.9 65
+MD5 1b866549cddb9e5a73a64be509395166 files/digest-rrdtool-1.2.11-r1 67
 MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6-r1 65
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.11-r1 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.11-r1
new file mode 100644
index 000000000000..ac9377e6f3c2
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.11-r1
@@ -0,0 +1 @@
+MD5 d61c5755cb77207f9ad3584b26e8bf08 rrdtool-1.2.11.tar.gz 1003339
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.11-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.11-r1.ebuild
new file mode 100644
index 000000000000..d35c678e4d50
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.2.11-r1.ebuild
@@ -0,0 +1,123 @@
+# 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.11-r1.ebuild,v 1.1 2005/09/06 12:28:17 strerror Exp $
+
+inherit perl-module flag-o-matic gnuconfig eutils multilib
+
+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="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="doc perl python tcltk"
+
+RDEPEND="tcltk? ( dev-lang/tcl )
+	>=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"
+
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	sys-apps/gawk
+	>=dev-libs/cgilib-0.5"
+
+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:-ltcl -lrrd:' \
+		bindings/tcl/Makefile.* || die "sed failed"
+	sed -i -e 's:python_PROGRAMS:pyexec_PROGRAMS:' \
+		bindings/python/Makefile.* || die "sed failed"
+	sed -i -e 's:\$TCL_PACKAGE_PATH:${TCL_PACKAGE_PATH%% *}:' \
+		configure.ac
+	libtoolize --copy --force
+	autoreconf
+}
+
+pkg_setup() {
+	use perl && perl-module_pkg_setup
+}
+
+src_compile() {
+	filter-mfpmath sse
+	filter-flags -ffast-math
+
+	local myconf
+	myconf="--datadir=/usr/share --enable-shared"
+
+	use tcltk \
+		&& myconf="${myconf} --with-tcllib=/usr/$(get_libdir)" \
+		|| myconf="${myconf} --without-tcllib"
+
+	use python || myconf="${myconf} --disable-python"
+
+	if use perl ; then
+		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || \
+			die "econf failed"
+	else
+		econf ${myconf} --disable-perl || die "econf failed"
+	fi
+
+	make || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	rm -fr ${D}/usr/examples
+	rm -fr ${D}/usr/shared
+
+	if use doc ; then
+		dohtml doc/*.html
+		dodoc doc/*.pod
+		dodoc doc/*.txt
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+		insinto /usr/share/doc/${PF}/contrib
+		doins contrib/*
+	fi
+
+	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/$(get_libdir)/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/$(get_libdir)/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
+}