Remove old. Make lua support optional. Remove last USE=nls usage.

(Portage version: 2.2_rc51/cvs/Linux i686)

3 files changed, 9 insertions, 101 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 85aac5d54f6a..ba922e35890e 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.196 2009/11/23 06:19:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.197 2009/11/24 16:55:48 jer Exp $
+
+  24 Nov 2009; Jeroen Roovers <jer@gentoo.org> -rrdtool-1.4.1.ebuild,
+  rrdtool-1.4.2.ebuild:
+  Remove old. Make lua support optional. Remove last USE=nls usage.
 
 *rrdtool-1.4.2 (23 Nov 2009)
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.1.ebuild
deleted file mode 100644
index 95741f5a72c7..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.1.ebuild,v 1.1 2009/11/23 06:01:04 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	tcl? ( dev-lang/tcl )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13
-			!dev-ruby/ruby-rrd )"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk"
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-	eautoconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=/usr/share/doc/${PF}
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable nls) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib /usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
-	fi
-
-	use perl && fixlocalpod
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with ann old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
index 24bc598a70dd..bd9a7315f9ce 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v 1.1 2009/11/23 06:07:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v 1.2 2009/11/24 16:55:48 jer Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc perl python ruby rrdcgi tcl"
+IUSE="doc lua perl python ruby rrdcgi tcl"
 
 # This versions are minimal versions upstream tested with.
 RDEPEND="
@@ -47,7 +47,8 @@ src_configure() {
 	export RRDDOCDIR=/usr/share/doc/${PF}
 
 	econf $(use_enable rrdcgi) \
-		$(use_enable nls) \
+		$(use_enable lua) \
+		$(use_enable lua lua-site-install) \
 		$(use_enable ruby) \
 		$(use_enable ruby ruby-site-install) \
 		$(use_enable perl) \