Add rrdcgi USE flag and functionality for bug 118679.

Package-Manager: portage-2.0.54

4 files changed, 144 insertions, 8 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 7f68cda6c905..c7bdb764c377 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.87 2005/12/26 15:26:44 blubb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.88 2006/02/03 22:07:04 vanquirius Exp $
+
+*rrdtool-1.2.12-r1 (03 Feb 2006)
+
+  03 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +rrdtool-1.2.12-r1.ebuild:
+  Add rrdcgi USE flag and functionality for bug 118679. Thanks to Timothy
+  Bergeron <bugs-gentoo at timothybergeron dot com>.
 
   26 Dec 2005; Simon Stelling <blubb@gentoo.org> rrdtool-1.2.6-r1.ebuild:
   fix multilib-strict wise
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 3a733b539d9f..57c527e775ec 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,12 +1,14 @@
-MD5 8ed506adfaa9ba29a6f6f4e6549aef84 ChangeLog 13563
+MD5 d8206d31447edf5a205fa284377bf0cf ChangeLog 13811
+MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67
+MD5 0f97ed6174056bc1f72fbd7eb964f3f6 files/digest-rrdtool-1.0.50 67
+MD5 1b866549cddb9e5a73a64be509395166 files/digest-rrdtool-1.2.11-r2 67
+MD5 a645d34412b1cb9db79c5c23840f720d files/digest-rrdtool-1.2.12 67
+MD5 a645d34412b1cb9db79c5c23840f720d files/digest-rrdtool-1.2.12-r1 67
+MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6-r1 65
 MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
 MD5 7245abe6326ff3cc840e5092c1b60890 rrdtool-1.0.49.ebuild 2729
 MD5 177f6939c1ba72adbbd42b99ea93121f rrdtool-1.0.50.ebuild 2753
 MD5 d3efb11170c152101c8411b0d3c6a7e3 rrdtool-1.2.11-r2.ebuild 3010
+MD5 060136b3fa7c34851755e8aa9e8261ce rrdtool-1.2.12-r1.ebuild 3092
 MD5 ffc157e2afe0484205fc754ec73d9170 rrdtool-1.2.12.ebuild 2985
 MD5 916a2ac749bc18f0d3515931bcc3c592 rrdtool-1.2.6-r1.ebuild 2792
-MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67
-MD5 0f97ed6174056bc1f72fbd7eb964f3f6 files/digest-rrdtool-1.0.50 67
-MD5 1b866549cddb9e5a73a64be509395166 files/digest-rrdtool-1.2.11-r2 67
-MD5 a645d34412b1cb9db79c5c23840f720d files/digest-rrdtool-1.2.12 67
-MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6-r1 65
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.12-r1 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.12-r1
new file mode 100644
index 000000000000..a7636ee619ba
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.12-r1
@@ -0,0 +1 @@
+MD5 7b544c38a818cbebcf06fe39b9f52d0d rrdtool-1.2.12.tar.gz 1022309
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.12-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.12-r1.ebuild
new file mode 100644
index 000000000000..bf1988afb43f
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.2.12-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.12-r1.ebuild,v 1.1 2006/02/03 22:07:04 vanquirius 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 ~ppc64 ~sparc ~x86"
+IUSE="doc perl python rrdcgi 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
+	rrdcgi? ( >=dev-libs/cgilib-0.5 )"
+
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	sys-apps/gawk"
+
+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} \
+			$(use_enable rrdcgi) \
+			--with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || \
+			die "econf failed"
+	else
+		econf ${myconf} \
+			$(use_enable rrdcgi) \
+			--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 CONTRIBUTORS 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
+}